improved activate button responsive to be more instant

svn:r21778

Orbot/src/org/torproject/android/Orbot.java

@@ -631,16 +631,52 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
 		{
 			try
 			{
+				
 				if (mService == null)
 				{
 				
 				}
 				else if (mService.getStatus() == STATUS_READY)
 				{
+					
 					mService.setProfile(PROFILE_ON); //this means turn on
 					
+					imgStatus.setImageResource(R.drawable.torstarting);
+		    		lblStatus.setText(getString(R.string.status_starting_up));
+		    		
+					Message msg = mHandler.obtainMessage(ENABLE_TOR_MSG);
+		        	mHandler.sendMessage(msg);
+		        	
 		        	updateStatus("");
 					
+				}
+				else
+				{
+					
+					mService.setProfile(PROFILE_ONDEMAND);	//these means turn off
+					
+					Message msg = mHandler.obtainMessage(DISABLE_TOR_MSG);
+		        	mHandler.sendMessage(msg);
+		        	
+		        	updateStatus("");
+					
+				}
+				
+			}
+			catch (Exception e)
+			{
+				Log.i(TAG,"error onclick",e);
+			}
+			
+		}
+		
+		
+	}
+	
+	private void doTorSetup (boolean enabled)
+	{
+		if (enabled)
+		{
 			processSettings();
 			
 	
@@ -653,10 +689,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
 		}
 		else
 		{
-					
-					mService.setProfile(PROFILE_ONDEMAND);	//these means turn off
-					updateStatus("");
-					
 			if (hasRoot && enableTransparentProxy)
 			{
 				TorTransProxy.purgeNatIptables();
@@ -665,15 +697,6 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
 			}
 		}
 	}
-			catch (Exception e)
-			{
-				Log.i(TAG,"error onclick",e);
-			}
-			
-		}
-		
-		
-	}
 	
     /**
      * This implementation is used to receive callbacks from the remote
@@ -697,6 +720,8 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
     
     private static final int BUMP_MSG = 1;
     
+    private static final int ENABLE_TOR_MSG = 2;
+    private static final int DISABLE_TOR_MSG = 3;
     	
     private Handler mHandler = new Handler() {
         @Override public void handleMessage(Message msg) {
@@ -711,6 +736,15 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
                 	updateStatus(torServiceMsg);
                 	
                     break;
+                case ENABLE_TOR_MSG:
+                	
+                	doTorSetup(true);
+                	break;
+                case DISABLE_TOR_MSG:
+                	
+                	doTorSetup(false);
+                	break;
+                		
                 default:
                     super.handleMessage(msg);
             }

Orbot/src/org/torproject/android/service/TorService.java

@@ -699,6 +699,8 @@ public class TorService extends Service implements TorServiceConstants, Runnable
         public void setProfile (int profile)
         {
         	setTorProfile(profile);
+        	sendCallbackMessage("");
+        	
         }
         
     };