From a6a9d9306562ae4edcf7065a024e3837d7ba7551 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 15 Apr 2013 22:10:49 +1200
Subject: Login modifications

---
 .../web/client/controller/LoginController.java     | 42 ++++++++++------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'src/org/traccar/web/client/controller/LoginController.java')

diff --git a/src/org/traccar/web/client/controller/LoginController.java b/src/org/traccar/web/client/controller/LoginController.java
index 06471377..f8fdc8c2 100644
--- a/src/org/traccar/web/client/controller/LoginController.java
+++ b/src/org/traccar/web/client/controller/LoginController.java
@@ -39,13 +39,13 @@ public class LoginController implements LoginDialog.LoginHandler {
         Application.getDataService().authenticated(new BaseAsyncCallback<User>() {
             @Override
             public void onSuccess(User result) {
-                if (result != null) {
-                    ApplicationContext.getInstance().setUser(result);
-                    loginHandler.onLogin();
-                } else {
-                    dialog = new LoginDialog(LoginController.this);
-                    dialog.show();
-                }
+                ApplicationContext.getInstance().setUser(result);
+                loginHandler.onLogin();
+            }
+            @Override
+            public void onFailure(Throwable caught) {
+                dialog = new LoginDialog(LoginController.this);
+                dialog.show();
             }
         });
     }
@@ -64,16 +64,16 @@ public class LoginController implements LoginDialog.LoginHandler {
             Application.getDataService().login(login, password, new BaseAsyncCallback<User>() {
                 @Override
                 public void onSuccess(User result) {
-                    if (result != null) {
-                        ApplicationContext.getInstance().setUser(result);
-                        if (loginHandler != null) {
-                            dialog.hide();
-                            loginHandler.onLogin();
-                        }
-                    } else {
-                        new AlertMessageBox("Error", "User name or password is invalid").show();
+                    ApplicationContext.getInstance().setUser(result);
+                    if (loginHandler != null) {
+                        dialog.hide();
+                        loginHandler.onLogin();
                     }
                 }
+                @Override
+                public void onFailure(Throwable caught) {
+                    new AlertMessageBox("Error", "User name or password is invalid").show();
+                }
             });
         }
     }
@@ -84,14 +84,10 @@ public class LoginController implements LoginDialog.LoginHandler {
             Application.getDataService().register(login, password, new BaseAsyncCallback<User>() {
                 @Override
                 public void onSuccess(User result) {
-                    if (result != null) {
-                        ApplicationContext.getInstance().setUser(result);
-                        if (loginHandler != null) {
-                            dialog.hide();
-                            loginHandler.onLogin();
-                        }
-                    } else {
-                        new AlertMessageBox("Error", "Registration error").show();
+                    ApplicationContext.getInstance().setUser(result);
+                    if (loginHandler != null) {
+                        dialog.hide();
+                        loginHandler.onLogin();
                     }
                 }
             });
-- 
cgit v1.2.3