From 6a7c593353f725d6fb3863ad04220061c60d942c Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Sat, 28 Mar 2015 00:39:58 -0400
Subject: [PATCH] a little bit of code re-org and new package for wizard

---
 AndroidManifest.xml                           |  4 +--
 res/menu/orbot_main.xml                       |  8 ++++-
 res/values/strings.xml                        |  2 ++
 src/org/torproject/android/OrbotApp.java      |  2 +-
 ...{TorConstants.java => OrbotConstants.java} |  2 +-
 .../torproject/android/OrbotMainActivity.java | 35 ++++++++++---------
 .../android/service/TorResourceInstaller.java |  4 +--
 .../android/service/TorService.java           | 26 +++++++-------
 .../android/service/TorServiceUtils.java      |  6 ++--
 .../android/service/TorTransProxy.java        |  6 ++--
 .../android/settings/AppManager.java          |  4 +--
 .../android/ui/OrbotLogActivity.java          |  4 +--
 .../ChooseLocaleWizardActivity.java           |  6 ++--
 .../ui/{ => wizard}/TipsAndTricks.java        |  6 ++--
 14 files changed, 63 insertions(+), 52 deletions(-)
 rename src/org/torproject/android/{TorConstants.java => OrbotConstants.java} (98%)
 rename src/org/torproject/android/ui/{ => wizard}/ChooseLocaleWizardActivity.java (97%)
 rename src/org/torproject/android/ui/{ => wizard}/TipsAndTricks.java (97%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0dbd1924..ee624d85 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -88,8 +88,8 @@
 			/> 
 			      	
 			      	
-      	<activity android:name=".ui.TipsAndTricks" android:exported="false"/>
-      	<activity android:name=".ui.ChooseLocaleWizardActivity" android:exported="false"/>
+      	<activity android:name="org.torproject.android.ui.wizard.TipsAndTricks" android:exported="false"/>
+  org.torproject.android.ui.wizard.ChooseLocaleWizardActivityui.ChooseLocaleWizardActivity" android:exported="false"/>
       	
       	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
         <activity android:name=".settings.AppManager"  android:label="@string/app_name"/>       
diff --git a/res/menu/orbot_main.xml b/res/menu/orbot_main.xml
index 55e5b17b..cff67e90 100644
--- a/res/menu/orbot_main.xml
+++ b/res/menu/orbot_main.xml
@@ -26,6 +26,11 @@
          yourapp:showAsAction="always"
          />
 
+ <item
+        android:title="@string/menu_qr"
+         yourapp:showAsAction="never"
+         >
+  <menu>
   <item android:id="@+id/menu_scan"
         android:title="@string/menu_scan"
          yourapp:showAsAction="never"
@@ -35,7 +40,8 @@
         android:title="@string/menu_share_bridge"
          yourapp:showAsAction="never"
          />
- 
+  </menu>
+ </item>
  
 <!-- 
         <item android:id="@+id/menu_verify"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b7b0cc6..f5a1fe71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -316,4 +316,6 @@
   <string name="bridges_updated">Bridges Updated</string>
   
   <string name="restart_orbot_to_use_this_bridge_">"Restart Orbot to use these bridges: "</string>
+  
+  <string name="menu_qr">QR Codes</string>
 </resources>
diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java
index cb1824cf..4e6d9ec6 100644
--- a/src/org/torproject/android/OrbotApp.java
+++ b/src/org/torproject/android/OrbotApp.java
@@ -9,7 +9,7 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.preference.PreferenceManager;
 
-public class OrbotApp extends Application implements TorConstants
+public class OrbotApp extends Application implements OrbotConstants
 {
 
 	private Locale locale;
diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/OrbotConstants.java
similarity index 98%
rename from src/org/torproject/android/TorConstants.java
rename to src/org/torproject/android/OrbotConstants.java
index 9b0966eb..e400851e 100644
--- a/src/org/torproject/android/TorConstants.java
+++ b/src/org/torproject/android/OrbotConstants.java
@@ -3,7 +3,7 @@
 
 package org.torproject.android;
 
-public interface TorConstants {
+public interface OrbotConstants {
 
 	public final static String TAG = "Orbot";
 	
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index 9f38be42..406f15d7 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -13,10 +13,10 @@ import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.TorServiceUtils;
 import org.torproject.android.settings.SettingsPreferences;
-import org.torproject.android.ui.ChooseLocaleWizardActivity;
 import org.torproject.android.ui.ImageProgressView;
 import org.torproject.android.ui.Rotate3dAnimation;
-import org.torproject.android.ui.TipsAndTricks;
+import org.torproject.android.ui.wizard.ChooseLocaleWizardActivity;
+import org.torproject.android.ui.wizard.TipsAndTricks;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -67,7 +67,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
 
-public class OrbotMainActivity extends Activity implements TorConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener
+public class OrbotMainActivity extends Activity implements OrbotConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener
 {
     /* Useful UI bits */
     private TextView lblStatus = null; //the main text display widget
@@ -417,18 +417,21 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
                 else if (item.getItemId() == R.id.menu_share_bridge)
                 {
                 	
-            		String bridges = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null);
+            		String bridges = mPrefs.getString(OrbotConstants.PREF_BRIDGES_LIST, null);
                 	
-            		try {
-						bridges = "bridge://" + URLEncoder.encode(bridges,"UTF-8");
-	            		
-	                	IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this);
-	                	integrator.shareText(bridges);
-	                	
-					} catch (UnsupportedEncodingException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+            		if (bridges != null && bridges.length() > 0)
+            		{
+	            		try {
+							bridges = "bridge://" + URLEncoder.encode(bridges,"UTF-8");
+		            		
+		                	IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this);
+		                	integrator.shareText(bridges);
+		                	
+						} catch (UnsupportedEncodingException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+            		}
 
                 }
                 
@@ -652,8 +655,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
 		
 		Editor pEdit = mPrefs.edit();
 		
-		pEdit.putString(TorConstants.PREF_BRIDGES_LIST,newBridgeValue); //set the string to a preference
-		pEdit.putBoolean(TorConstants.PREF_BRIDGES_ENABLED,true);
+		pEdit.putString(OrbotConstants.PREF_BRIDGES_LIST,newBridgeValue); //set the string to a preference
+		pEdit.putBoolean(OrbotConstants.PREF_BRIDGES_ENABLED,true);
 	
 		pEdit.commit();
 		
diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java
index 6f81f977..a56c6184 100644
--- a/src/org/torproject/android/service/TorResourceInstaller.java
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
@@ -20,7 +20,7 @@ import java.util.zip.ZipInputStream;
 import org.sufficientlysecure.rootcommands.Shell;
 import org.sufficientlysecure.rootcommands.command.SimpleCommand;
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 
 import android.content.Context;
 import android.util.Log;
@@ -265,7 +265,7 @@ public class TorResourceInstaller implements TorServiceConstants {
             
             
         } catch (IOException ex) {
-            Log.e(TorConstants.TAG, "error copying binary", ex);
+            Log.e(OrbotConstants.TAG, "error copying binary", ex);
         }
 
     }
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 51003685..9529d6dd 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -51,7 +51,7 @@ import org.sufficientlysecure.rootcommands.Shell;
 import org.sufficientlysecure.rootcommands.command.SimpleCommand;
 import org.torproject.android.OrbotMainActivity;
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 import org.torproject.android.settings.AppManager;
 import org.torproject.android.settings.TorifiedApp;
 import org.torproject.android.vpn.OrbotVpnService;
@@ -79,7 +79,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler
+public class TorService extends Service implements TorServiceConstants, OrbotConstants, EventHandler
 {
     
     public static boolean ENABLE_DEBUG_LOG = true;
@@ -783,7 +783,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
         ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false);
         Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG);
 
-        prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true);
+        prefPersistNotifications = prefs.getBoolean(OrbotConstants.PREF_PERSIST_NOTIFICATIONS, true);
         
         mUseVPN = prefs.getBoolean("pref_vpn", false);
     }
@@ -811,7 +811,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
         ArrayList<String> customEnv = new ArrayList<String>();
      
         SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
-        boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false);
+        boolean useBridges = prefs.getBoolean(OrbotConstants.PREF_BRIDGES_ENABLED, false);
 
         if (useBridges)
         	if (mUseVPN && !mIsLollipop)
@@ -1185,7 +1185,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 
                             SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
                             
-                             String socksPortPref = prefs.getString(TorConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT);
+                             String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT);
                              if (socksPortPref.indexOf(':')!=-1)
                                  socksPortPref = socksPortPref.split(":")[1];
                              
@@ -2043,7 +2043,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 
             SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
 
-            boolean doNetworKSleep = prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true);
+            boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true);
             
             final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
             final NetworkInfo netInfo = cm.getActiveNetworkInfo();
@@ -2114,10 +2114,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
         enableTransProxyAndDNSPorts(transPort, dnsPort);
         */
         
-        boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false);
+        boolean useBridges = prefs.getBoolean(OrbotConstants.PREF_BRIDGES_ENABLED, false);
 
-        boolean becomeRelay = prefs.getBoolean(TorConstants.PREF_OR, false);
-        boolean ReachableAddresses = prefs.getBoolean(TorConstants.PREF_REACHABLE_ADDRESSES,false);
+        boolean becomeRelay = prefs.getBoolean(OrbotConstants.PREF_OR, false);
+        boolean ReachableAddresses = prefs.getBoolean(OrbotConstants.PREF_REACHABLE_ADDRESSES,false);
         boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false);
 
         boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false);
@@ -2182,7 +2182,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 
             updateConfiguration("UseBridges", "1", false);
             
-            String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,null);
+            String bridgeList = prefs.getString(OrbotConstants.PREF_BRIDGES_LIST,null);
             
             if (bridgeList != null && bridgeList.length() > 1) //longer then 1 = some real values here
             {
@@ -2302,7 +2302,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
             if (ReachableAddresses)
             {
                 String ReachableAddressesPorts =
-                    prefs.getString(TorConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443");
+                    prefs.getString(OrbotConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443");
                 
                 updateConfiguration("ReachableAddresses", ReachableAddressesPorts, false);
 
@@ -2323,8 +2323,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
         {
             if (becomeRelay && (!useBridges) && (!ReachableAddresses))
             {
-                int ORPort =  Integer.parseInt(prefs.getString(TorConstants.PREF_OR_PORT, "9001"));
-                String nickname = prefs.getString(TorConstants.PREF_OR_NICKNAME, "Orbot");
+                int ORPort =  Integer.parseInt(prefs.getString(OrbotConstants.PREF_OR_PORT, "9001"));
+                String nickname = prefs.getString(OrbotConstants.PREF_OR_NICKNAME, "Orbot");
 
                 String dnsFile = writeDNSFile ();
                 
diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java
index a22b3289..609a8e2a 100644
--- a/src/org/torproject/android/service/TorServiceUtils.java
+++ b/src/org/torproject/android/service/TorServiceUtils.java
@@ -9,7 +9,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.StringTokenizer;
 
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -117,9 +117,9 @@ public class TorServiceUtils implements TorServiceConstants {
 	public static SharedPreferences getSharedPrefs (Context context)
 	{
 		if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.HONEYCOMB)
-			return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
+			return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
 		else
-			return context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE);
+			return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE);
 		
 	}
 }
diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java
index 78b6ebd4..4c32bb5f 100644
--- a/src/org/torproject/android/service/TorTransProxy.java
+++ b/src/org/torproject/android/service/TorTransProxy.java
@@ -7,7 +7,7 @@ import java.util.concurrent.TimeoutException;
 
 import org.sufficientlysecure.rootcommands.Shell;
 import org.sufficientlysecure.rootcommands.command.SimpleCommand;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 import org.torproject.android.settings.TorifiedApp;
 
 import android.content.Context;
@@ -49,7 +49,7 @@ public class TorTransProxy implements TorServiceConstants {
 		
 		SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context);
 
-		useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false);
+		useSystemIpTables = prefs.getBoolean(OrbotConstants.PREF_USE_SYSTEM_IPTABLES, false);
 		
 		if (useSystemIpTables)
 		{
@@ -72,7 +72,7 @@ public class TorTransProxy implements TorServiceConstants {
 		
 		SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context);
 
-		useSystemIpTables = prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false);
+		useSystemIpTables = prefs.getBoolean(OrbotConstants.PREF_USE_SYSTEM_IPTABLES, false);
 		
 		if (useSystemIpTables)
 		{
diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java
index 5818519f..19dff0a7 100644
--- a/src/org/torproject/android/settings/AppManager.java
+++ b/src/org/torproject/android/settings/AppManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 import org.torproject.android.service.TorServiceUtils;
 
 import android.app.Activity;
@@ -38,7 +38,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 //import android.R;
 
-public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, TorConstants {
+public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, OrbotConstants {
 
     private ListView listApps;
     private final static String TAG = "Orbot";
diff --git a/src/org/torproject/android/ui/OrbotLogActivity.java b/src/org/torproject/android/ui/OrbotLogActivity.java
index ae83b770..4a24d3f1 100644
--- a/src/org/torproject/android/ui/OrbotLogActivity.java
+++ b/src/org/torproject/android/ui/OrbotLogActivity.java
@@ -3,7 +3,7 @@
 
 package org.torproject.android.ui;
 
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -14,7 +14,7 @@ import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 
 
-public class OrbotLogActivity extends Activity implements TorConstants
+public class OrbotLogActivity extends Activity implements OrbotConstants
 {
 	
     /** Called when the activity is first created. */
diff --git a/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java
similarity index 97%
rename from src/org/torproject/android/ui/ChooseLocaleWizardActivity.java
rename to src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java
index 95f87667..3fdd7466 100644
--- a/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java
+++ b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java
@@ -1,9 +1,9 @@
-package org.torproject.android.ui;
+package org.torproject.android.ui.wizard;
 
 import java.util.Locale;
 
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 import org.torproject.android.service.TorServiceUtils;
 
 import android.app.Activity;
@@ -21,7 +21,7 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
 
-public class ChooseLocaleWizardActivity extends Activity implements TorConstants {
+public class ChooseLocaleWizardActivity extends Activity implements OrbotConstants {
 
     private int flag = 0;
     private ListView listLocales;
diff --git a/src/org/torproject/android/ui/TipsAndTricks.java b/src/org/torproject/android/ui/wizard/TipsAndTricks.java
similarity index 97%
rename from src/org/torproject/android/ui/TipsAndTricks.java
rename to src/org/torproject/android/ui/wizard/TipsAndTricks.java
index d0e711bd..d47a4fba 100644
--- a/src/org/torproject/android/ui/TipsAndTricks.java
+++ b/src/org/torproject/android/ui/wizard/TipsAndTricks.java
@@ -1,7 +1,7 @@
-package org.torproject.android.ui;
+package org.torproject.android.ui.wizard;
 
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
+import org.torproject.android.OrbotConstants;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -13,7 +13,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class TipsAndTricks extends Activity implements TorConstants {
+public class TipsAndTricks extends Activity implements OrbotConstants {
 
     protected void onCreate(Bundle savedInstanceState)
     {