Merge branch 'master' of github.com:Determinant/piztor

1 files changed, 25 insertions, 9 deletions

diff --git a/client/Piztor/src/com/macaroon/piztor/Login.java b/client/Piztor/src/com/macaroon/piztor/Login.java
index 4ddd603..52df2c9 100644
--- a/client/Piztor/src/com/macaroon/piztor/Login.java
+++ b/client/Piztor/src/com/macaroon/piztor/Login.java
@@ -1,26 +1,33 @@
 package com.macaroon.piztor;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
 public class Login extends PiztorAct {
-	
-	
+
 	ActMgr actMgr;
 	Button btnLogin;
 	EditText edtUser, edtPass;
 
 	int loginButtonClick = 1, retryButtonClick = 2, loginFailed = 3;
-	
+
+	@SuppressLint("HandlerLeak")
 	Handler hand = new Handler() {
 		@Override
 		public void handleMessage(Message m) {
 			System.out.println("receive what : " + m.what);
+			if (m.what == -1) {
+				((Exception) m.obj).printStackTrace();
+				actMgr.trigger(loginFailed);
+				return;
+			}
 			if (m.what == 0) {
 				ResLogin res = (ResLogin) m.obj;
 				UserInfo.token = res.t;
@@ -33,7 +40,7 @@ public class Login extends PiztorAct {
 			}
 		}
 	};
-	
+
 	class StartStatus extends ActStatus {
 
 		@Override
@@ -44,7 +51,7 @@ public class Login extends PiztorAct {
 		void leave(int e) {
 		}
 	}
-	
+
 	class LoginStatus extends ActStatus {
 
 		@Override
@@ -53,14 +60,14 @@ public class Login extends PiztorAct {
 			String pass = edtPass.getText().toString();
 			long nowtime = System.currentTimeMillis();
 			System.out.println(user + " : " + pass + "\n");
-			AppMgr.transam.send(new ReqLogin(user, pass, nowtime, 10000));
+			AppMgr.transam.send(new ReqLogin(user, pass, nowtime, 5000));
 		}
 
 		@Override
 		void leave(int e) {
-			
+
 		}
-		
+
 	}
 
 	@Override
@@ -94,7 +101,16 @@ public class Login extends PiztorAct {
 	@Override
 	protected void onResume() {
 		super.onResume();
-	
+
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		 if (keyCode == KeyEvent.KEYCODE_BACK) {
+			 AppMgr.exit();
+			 return true;
+		 }
+		 return super.onKeyDown(keyCode, event);
 	}
 
 	@Override