[tor-commits] [orbot/master] Merge branch 'master' of git://git.torproject.org/n8fr8/orbot

[n8fr8 at torproject.org]

commit 821b911db3f89b91bff910a3aa678c390a5b636c
Merge: 34ce453 4dda90e
Author: Sathyanarayanan Gunasekaran <gsathya.ceg at gmail.com>
Date:   Fri Nov 4 01:21:50 2011 +0530

    Merge branch 'master' of git://git.torproject.org/n8fr8/orbot

 .classpath                                         |    1 +
 AndroidManifest.xml                                |   19 +-
 AndroidManifest.xml.debug                          |   61 ---
 AndroidManifest.xml.production                     |   61 ---
 BUILD                                              |   15 +-
 libs/whispercore.jar                               |  Bin 0 -> 9849 bytes
 res/drawable/background.jpg                        |  Bin 33361 -> 0 bytes
 res/drawable/bgtitanium.jpg                        |  Bin 122818 -> 40884 bytes
 res/drawable/error.png                             |  Bin 0 -> 2922 bytes
 res/drawable/ic_launcher_gibberbot.png             |  Bin 7527 -> 6365 bytes
 res/drawable/icon_orweb.png                        |  Bin 0 -> 8783 bytes
 res/drawable/tor.png                               |  Bin 6682 -> 4766 bytes
 res/drawable/warning.png                           |  Bin 2922 -> 2735 bytes
 res/layout/layout_about.xml                        |    2 +-
 res/layout/layout_apps.xml                         |   18 +-
 res/layout/layout_wizard_permissions.xml           |   39 ++-
 res/layout/layout_wizard_tips.xml                  |   37 ++-
 res/layout/scrollingtext_buttons_view.xml          |   18 +-
 res/raw/geoip.zip                                  |  Bin 0 -> 966562 bytes
 res/raw/tor.zip                                    |  Bin 0 -> 1553272 bytes
 res/raw/toraa                                      |  Bin 1048576 -> 0 bytes
 res/raw/torab                                      |  Bin 1048576 -> 0 bytes
 res/raw/torac                                      |  Bin 1048576 -> 0 bytes
 res/raw/torad                                      |  Bin 194605 -> 0 bytes
 res/raw/torrc                                      |    8 +-
 res/raw/torrctether                                |   14 +
 res/values-ar/strings.xml                          |    5 -
 res/values-ca/strings.xml                          |    4 -
 res/values-de/strings.xml                          |    4 -
 res/values-es/strings.xml                          |    4 -
 res/values-fa/strings.xml                          |    4 -
 res/values-mk/strings.xml                          |    4 -
 res/values-nb/strings.xml                          |    4 -
 res/values-nl/strings.xml                          |    4 -
 res/values-pl/strings.xml                          |    5 -
 res/values-pt/strings.xml                          |    4 -
 res/values-ru/strings.xml                          |    4 -
 res/values-sv/strings.xml                          |    4 -
 res/values-zh/strings.xml                          |    4 -
 res/values/strings.xml                             |   71 ++--
 res/xml/preferences.xml                            |   26 ++
 src/org/torproject/android/AppManager.java         |  272 ------------
 .../torproject/android/ConfigureTransProxy.java    |  183 --------
 src/org/torproject/android/LotsaText.java          |  133 ------
 src/org/torproject/android/Orbot.java              |   88 ++---
 src/org/torproject/android/Permissions.java        |  229 ----------
 .../android/ProcessSettingsAsyncTask.java          |   32 --
 .../torproject/android/SettingsPreferences.java    |  134 ------
 src/org/torproject/android/TipsAndTricks.java      |  139 -------
 src/org/torproject/android/TorConstants.java       |    7 +-
 src/org/torproject/android/TorifiedApp.java        |  111 -----
 src/org/torproject/android/WizardHelper.java       |  425 -------------------
 .../android/service/TorBinaryInstaller.java        |   70 ++--
 src/org/torproject/android/service/TorService.java |   70 ++--
 .../android/service/TorServiceConstants.java       |    9 +-
 .../android/service/TorServiceUtils.java           |   44 +--
 .../torproject/android/service/TorTransProxy.java  |    6 +-
 .../torproject/android/service/TorrcConfig.java    |   33 ++
 .../torproject/android/service/WhisperManager.java |   93 +++++
 .../torproject/android/settings/AppManager.java    |  287 +++++++++++++
 .../android/settings/ProcessSettingsAsyncTask.java |   32 ++
 .../android/settings/SettingsPreferences.java      |  132 ++++++
 .../torproject/android/settings/TorifiedApp.java   |  111 +++++
 .../android/wizard/ConfigureTransProxy.java        |  233 +++++++++++
 src/org/torproject/android/wizard/LotsaText.java   |  140 +++++++
 src/org/torproject/android/wizard/Permissions.java |  247 +++++++++++
 .../torproject/android/wizard/TipsAndTricks.java   |  180 ++++++++
 .../torproject/android/wizard/WizardHelper.java    |  435 ++++++++++++++++++++
 68 files changed, 2237 insertions(+), 2082 deletions(-)

diff --cc src/org/torproject/android/service/TorService.java
index 68fe6e2,c4b7b1f..6af973b
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@@ -40,10 -40,10 +40,10 @@@ import android.os.RemoteException
  import android.preference.PreferenceManager;
  import android.util.Log;
  
- public class TorService extends Service implements TorServiceConstants, Runnable, EventHandler
+ public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler
  {
  	
 -	public static boolean ENABLE_DEBUG_LOG = false;
 +	public static boolean ENABLE_DEBUG_LOG = true;
  	
  	private static int currentStatus = STATUS_OFF;
  		
@@@ -1273,11 -1274,9 +1274,10 @@@
      
      private boolean applyPreferences () throws RemoteException
      {
-     	
      	SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
  		
 -    	ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false);
 +    	//ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false);
 +    	ENABLE_DEBUG_LOG = true;
      	Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG);
      		
  		boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false);