From 93a1857a2ef60ca79d33d7cff390a4efbd17681d Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Tue, 17 May 2011 03:09:25 +0000 Subject: [PATCH 1/4] updated manifest files with latest version info svn:r24764 --- AndroidManifest.xml | 2 +- AndroidManifest.xml.debug | 3 ++- AndroidManifest.xml.production | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 079c3c6a..d01b58e4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.2" android:versionCode="14"> diff --git a/AndroidManifest.xml.debug b/AndroidManifest.xml.debug index a5a118a0..22b69dd1 100644 --- a/AndroidManifest.xml.debug +++ b/AndroidManifest.xml.debug @@ -1,6 +1,7 @@ + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug" + android:versionCode="13"> diff --git a/AndroidManifest.xml.production b/AndroidManifest.xml.production index d58fd3fb..56fc2285 100644 --- a/AndroidManifest.xml.production +++ b/AndroidManifest.xml.production @@ -1,6 +1,6 @@ + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a" android:versionCode="13"> From 99fa4dbfed8f20faa7243797d6a25d37496d6f79 Mon Sep 17 00:00:00 2001 From: Sathyanarayanan Gunasekaran Date: Wed, 15 Jun 2011 17:47:41 +0530 Subject: [PATCH 2/4] Added GSoC plan --- GSoC.txt | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 GSoC.txt diff --git a/GSoC.txt b/GSoC.txt new file mode 100644 index 00000000..d1d851e1 --- /dev/null +++ b/GSoC.txt @@ -0,0 +1,45 @@ +GSoC Plan +========= + +A tl;dr version +--------------- +I will be improving the Orbot UI/UX, and adding several features such as data statistics and also +implementing the TorCheck API. I plan on extending the ORLib library and also creating an ORLib enabled +app as a sort of primer for other third party apps to follow + +The full version +---------------- + +Orbot UI/UX +=========== +At the moment, the Orbot UI/UX is clustered and not very intuitive. I plan on improving the existing +elements of the UI and also add a variety of new features such as + +* A new Set – up Wizard ( which checks for iptables ) +* Changes to the preferences ( should be made to follow the Android guidelines) + +Orbot Core app work +=================== +At the moment, Orbot displays a successful connection without actually checking the connection. This is a +pressing issue, because the user is not notified if the set-up has failed, unless he/she manually checks +the torcheck web service. This should be made automatic by making using of the TorCheck API. Also, Orbot +should be configured to show more information about the data being transmitted such as - + +* Amount of data transferred +* Quality of the connection +* Number of circuits connected + +ORLib +===== +Currently, ORLib is very minimal at the moment, both in term of features and support/documentation. ORLib +is very critical to the use of Orbot as it provides transparent proxying on non-rooted devices ( A major +chunk of android phones are un-rooted). I intend to - + +* Improve the existing library by adding additional features + * Check for existing of Orbot + * Check status of connection to Tor + * Provide option to start Orbot via intent +* Request hidden service by port, and get return hidden service .onion address +* Create an ORLib enabled “Twitter, Status.net or other micro blogging Client” – A sort of primer for + third-party apps +* Improve the documentation From 3d3de96e647b3618dfafc7ad6099f15ae8e67779 Mon Sep 17 00:00:00 2001 From: Sathyanarayanan Gunasekaran Date: Wed, 29 Jun 2011 22:35:19 +0530 Subject: [PATCH 3/4] Updated AUTHORS --- AUTHORS | 2 +- src/org/torproject/android/service/TorService.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index f99ac6f9..5a848542 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,7 +27,7 @@ provided guidance in the entire effort. Adam Langley made the original valiant effort to port Tor to Android. -Sathyanarayanan created a patch for the wizard +Sathyanarayanan created a patch for the wizard which updated the icon and link for the secure chat app info to point to Gibberbot, and hopefully will continue to contribute useful patches. diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index fba41e1d..6d2eebdb 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -43,7 +43,7 @@ import android.util.Log; public class TorService extends Service implements TorServiceConstants, Runnable, EventHandler { - public static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = true; private static int currentStatus = STATUS_OFF; @@ -1057,7 +1057,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable */ private final ITorService.Stub mBinder = new ITorService.Stub() { - + public void registerCallback(ITorServiceCallback cb) { if (cb != null) mCallbacks.register(cb); } @@ -1275,7 +1275,8 @@ public class TorService extends Service implements TorServiceConstants, Runnable 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); From 4574c95b555e56aa5b60a11ca5937d66d42baf18 Mon Sep 17 00:00:00 2001 From: Sathyanarayanan Gunasekaran Date: Fri, 4 Nov 2011 01:44:50 +0530 Subject: [PATCH 4/4] Kill wizard activities on Exit Orbot.java's doExit() returns a RESULT_CLOSE_ALL to the wizard activities. The onActivityResult() is overrided in the wizard activities to kill all the activities if the result is RESULT_CLOSE_ALL --- src/org/torproject/android/Orbot.java | 4 +++- src/org/torproject/android/TorConstants.java | 2 +- .../android/wizard/ConfigureTransProxy.java | 14 +++++++++++++- src/org/torproject/android/wizard/LotsaText.java | 13 ++++++++++++- src/org/torproject/android/wizard/Permissions.java | 12 ++++++++++++ .../torproject/android/wizard/TipsAndTricks.java | 13 ++++++++++++- 6 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e105db70..8493f008 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -228,7 +228,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants private void doExit () { try { - + //one of the confusing things about all of this code is the multiple //places where things like "stopTor" are called, both in the Activity and the Service //not something to tackle in your first iteration, but i thin we can talk about fixing @@ -247,6 +247,8 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants Log.w(TAG, e); } + //Kill all the wizard activities + setResult(RESULT_CLOSE_ALL); finish(); } diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 38bb0d2d..df430c68 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -41,7 +41,7 @@ public interface TorConstants { public final static String PREF_TRANSPARENT_ALL = "pref_transparent_all"; public final static String PREF_HAS_ROOT = "has_root"; - + public final static int RESULT_CLOSE_ALL = 0; } diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index a343e04a..54336d47 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -61,6 +61,18 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + private void setupUI () { @@ -202,7 +214,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { @Override public void onClick(DialogInterface dialog, int which) { - context.startActivity(new Intent(context, Orbot.class)); + startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); } }; diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 1470a4bb..5af1e39c 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -55,7 +55,18 @@ public class LotsaText extends Activity implements TorConstants{ } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } private void stepOne() { @@ -135,6 +146,6 @@ public class LotsaText extends Activity implements TorConstants{ }); } - + } \ No newline at end of file diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index f2c24a06..151e6cb8 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -55,6 +55,18 @@ public class Permissions extends Activity implements TorConstants { } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + + private void stepThree(){ boolean isRootPossible = TorServiceUtils.isRootPossible(); diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index c46f2e48..ca8e4169 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -49,6 +49,17 @@ public class TipsAndTricks extends Activity implements TorConstants { } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + void stepFive(){ String title = getString(R.string.wizard_tips_title); @@ -141,7 +152,7 @@ public class TipsAndTricks extends Activity implements TorConstants { @Override public void onClick(View v) { - startActivity(new Intent(getBaseContext(), Orbot.class)); + startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); } });