From 64bcf0381f71e57c795df4ddd770e6ddb2edc542 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Tue, 10 Jun 2014 15:02:51 +0300
Subject: [PATCH] more android dialogs refactoring

---
 ui/dialogs/dialogs.android.ts | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/ui/dialogs/dialogs.android.ts b/ui/dialogs/dialogs.android.ts
index c528ada9d..ab4d5e789 100644
--- a/ui/dialogs/dialogs.android.ts
+++ b/ui/dialogs/dialogs.android.ts
@@ -19,13 +19,13 @@ function createAlertDialog(message: string, options: dialogs.DialogOptions): and
 }
 
 function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options: dialogs.DialogButtonsOptions,
-    okCallback: Function, cancelCallback?: Function, neutralCallback?: Function): void {
+    callback: Function): void {
 
     if (options.okButtonText) {
         alert.setPositiveButton(options.okButtonText, new android.content.DialogInterface.OnClickListener({
             onClick: function (dialog: android.content.DialogInterface, id: number) {
                 dialog.cancel();
-                okCallback();
+                callback(true);
             }
         }));
     }
@@ -34,9 +34,7 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
         alert.setNegativeButton(options.cancelButtonText, new android.content.DialogInterface.OnClickListener({
             onClick: function (dialog: android.content.DialogInterface, id: number) {
                 dialog.cancel();
-                if (cancelCallback) {
-                    cancelCallback();
-                }
+                callback(false);
             }
         }));
     }
@@ -45,9 +43,7 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
         alert.setNeutralButton(options.neutralButtonText, new android.content.DialogInterface.OnClickListener({
             onClick: function (dialog: android.content.DialogInterface, id: number) {
                 dialog.cancel();
-                if (neutralCallback) {
-                    neutralCallback();
-                }
+                callback(undefined);
             }
         }));
     }
@@ -79,7 +75,7 @@ export function confirm(message: string, options = { title: dialogs_common.CONFI
     try {
         var alert = createAlertDialog(message, options);
 
-        addButtonsToAlertDialog(alert, options, function () { d.resolve(true); }, function () { d.resolve(false); }, function () { d.resolve(); });
+        addButtonsToAlertDialog(alert, options, function (result) { d.resolve(result); });
 
         alert.show();
 
@@ -108,9 +104,7 @@ export function prompt(message: string, defaultText?: string,
 
         var getText = function () { return input.getText().toString(); };
 
-        addButtonsToAlertDialog(alert, options, function () { d.resolve({ result: true, text: getText() }); },
-            function () { d.resolve({ result: false, text: getText() }); },
-            function () { d.resolve({ result: undefined, text: getText() }); });
+        addButtonsToAlertDialog(alert, options, function (r) { d.resolve({ result: r, text: getText() }); });
 
         alert.show();
 
@@ -142,12 +136,13 @@ export function login(message: string, userName?: string, password?: string,
 
         alert.setView(layout);
 
-        var getUserName = function () { return userNameInput.getText().toString(); };
-        var getPassword = function () { return passwordInput.getText().toString(); };
-
-        addButtonsToAlertDialog(alert, options, function () { d.resolve(getLoginResult(true, getUserName, getPassword)); },
-            function () { d.resolve(getLoginResult(false, getUserName, getPassword)); },
-            function () { d.resolve(getLoginResult(undefined, getUserName, getPassword)); });
+        addButtonsToAlertDialog(alert, options, function (r) {
+            d.resolve({
+                result: r,
+                userName: userNameInput.getText().toString(),
+                password: passwordInput.getText().toString()
+            });
+        });
 
         alert.show();
 
@@ -158,10 +153,6 @@ export function login(message: string, userName?: string, password?: string,
     return d.promise();
 }
 
-function getLoginResult(r: boolean, getUserName: Function, getPassword: Function): dialogs.LoginResult {
-    return { result: r, userName: getUserName(), password: getPassword() };
-}
-
 export class Dialog {
     private _dialog: android.app.AlertDialog;
     private _android: android.app.AlertDialog.Builder;