October 2012 - tor-commits - lists.torproject.org

[orbot/master] added Google Play to tips page
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 7581f10f0fd1a92698717b8dfc6366cce68e5a48 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:18:00 2012 +0530 added Google Play to tips page --- res/drawable/ic_play.png | Bin 0 -> 3560 bytes res/layout/layout_wizard_tips.xml | 9 +++++++++ res/values/strings.xml | 12 +++++++----- .../torproject/android/wizard/TipsAndTricks.java | 13 +++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/res/drawable/ic_play.png b/res/drawable/ic_play.png new file mode 100644 index 0000000..a919794 Binary files /dev/null and b/res/drawable/ic_play.png differ diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 6bd9be0..d203889 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -112,6 +112,15 @@ android:drawableLeft="@drawable/ic_twitter" android:text="@string/wizard_tips_twitter" /> + <Button + android:id="@+id/WizardRootButtonGooglePlay" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/ic_play" + android:text="@string/wizard_tips_play" /> + </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9590e45..34be55c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,8 +31,8 @@ <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> -<string name="main_layout_download">Down (kbps/kb)</string> -<string name="main_layout_upload">Up (kbps/kb)</string> +<string name="main_layout_download">Download</string> +<string name="main_layout_upload">Upload</string> <string name="button_help">Help</string> <string name="button_close">Close</string> @@ -105,7 +105,7 @@ <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string> - <string name="proxymob_setup_url">http://tinyurl.com/getproxymob</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Set Twitter proxy to host "localhost" and port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> @@ -146,11 +146,13 @@ <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!-- <string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 26cf7ae..97b8d9a 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -130,6 +130,19 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); + btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); + + btnLink.setOnClickListener(new OnClickListener() { + + public void onClick(View view) { + + String url = getString(R.string.wizard_tips_play_url); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + + } + }); + + Button back = ((Button)findViewById(R.id.btnWizard1)); Button next = ((Button)findViewById(R.id.btnWizard2));

1 0

[orbot/master] updated wizard to always show recommended apps
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 187b8e26436cb461c396c8d05145aa08884e98c3 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:43:34 2012 +0530 updated wizard to always show recommended apps --- .../android/wizard/ConfigureTransProxy.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 79cb477..49aa2e3 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -127,7 +127,8 @@ public class ConfigureTransProxy extends Activity implements TorConstants { public void onClick(View v) { - showWizardFinal(); + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); + } }); @@ -196,6 +197,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } + /* private void showWizardFinal () { String title = null; @@ -224,7 +226,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { - } + }*/ @Override protected void onRestoreInstanceState(Bundle savedInstanceState) {

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 8cb47d7ccf37a8a9ae1e290160990326439d70bb Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:43:56 2012 +0530 updated changelog --- CHANGELOG | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fafc51a..42870d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at http - transproxy ensures that UDP is blocked properly for all or selected apps - wizard display is centered - added network connectivity monitor to set Tor's DisableNetwork value +- fixed wizard tips apps recommendations; added DuckGo, Twitter, Firefox Proxymob +- insure that iptables rules are only added once, and that all are cleared 1.0.9 - Tor now updated to 0.2.3.17-beta

1 0

[orbot/master] updated manifest for v11 RC4
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 24f28762916b1c260263185b306f0922d7495bcc Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:44:09 2012 +0530 updated manifest for v11 RC4 --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5feff12..bce37a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.4.3-alpha-1.0.11-RC3" - android:versionCode="48" + android:versionName="0.2.4.3-alpha-1.0.11-RC4" + android:versionCode="49" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0

[orbot/master] 0.2.4.4-alpha-1.0.11-RC4
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 0b1ec126435893d89c65ab6fb578f3fc6f686260 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:52:30 2012 +0530 0.2.4.4-alpha-1.0.11-RC4 --- external/tor | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/tor b/external/tor index 2513a3e..fe3b95f 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 2513a3e959b616126f2c0a050e9f8f9593721ef7 +Subproject commit fe3b95f3596194276eac8d1644cec56263a0cf0e

1 0

[orbot/master] updated tor binary to 0.2.4.4-alpha
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 7dcdb4c42db10f8e223c521600aa58854b00ec9f Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:52:16 2012 +0530 updated tor binary to 0.2.4.4-alpha --- res/raw/tor.mp3 | Bin 2086239 -> 2140153 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 3237871..1f158eb 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ

1 0

[orbot/master] 0.2.4.4-alpha-1.0.11-RC4
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 85d065f40ce35afa2af1b275caee13cc6c9321d5 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 17:52:49 2012 +0530 0.2.4.4-alpha-1.0.11-RC4 --- AndroidManifest.xml | 2 +- CHANGELOG | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bce37a7..98b26ad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.4.3-alpha-1.0.11-RC4" + android:versionName="0.2.4.4-alpha-1.0.11-RC4" android:versionCode="49" android:installLocation="auto" > diff --git a/CHANGELOG b/CHANGELOG index 42870d7..15fa59a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.11 -- Tor updated to 0.2.4-alpha +- Tor updated to 0.2.4.4-alpha - libevent2 on 2.2.1-alpha - added data up/down speed and totals display - added new "Log" SlideDrawer log display

1 0

[orbot/master] removed unused method from binary installer
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 50de0bb78849d445402d28658a4bba1436797195 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Oct 21 15:32:40 2012 +0530 removed unused method from binary installer --- .../android/service/TorBinaryInstaller.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 81f6db8..51ff907 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -97,6 +97,7 @@ public class TorBinaryInstaller implements TorServiceConstants { return true; } + /* private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException { @@ -110,7 +111,8 @@ public class TorBinaryInstaller implements TorServiceConstants { } out.close(); is.close(); - } + }*/ + /* * Write the inputstream contents to the file */

1 0

[orbot/master] minor updates for ActionBarSherlock support
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 46bf5dd6be9f1771ae2a10a23f4e4a93eed76449 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Oct 21 15:32:04 2012 +0530 minor updates for ActionBarSherlock support --- res/menu/main.xml | 11 +++++++++++ src/org/torproject/android/Orbot.java | 15 +++++++++------ .../android/settings/SettingsPreferences.java | 4 +++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/res/menu/main.xml b/res/menu/main.xml index 9dbf9a2..7870c32 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -22,31 +22,42 @@ <item android:id="@+id/menu_start" android:title="@string/menu_start" android:icon="@drawable/ic_action_start" + android:showAsAction="ifRoom" + /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" android:icon="@drawable/ic_action_settings" + android:showAsAction="always" /> <item android:id="@+id/menu_verify" android:title="@string/menu_verify" android:icon="@drawable/ic_action_browse" + android:showAsAction="always" + /> <item android:id="@+id/menu_about" android:title="@string/menu_about" android:icon="@drawable/ic_menu_about" + android:showAsAction="ifRoom" + /> <item android:id="@+id/menu_wizard" android:title="@string/menu_wizard" android:icon="@drawable/ic_menu_goto" + android:showAsAction="ifRoom" + /> <item android:id="@+id/menu_exit" android:title="@string/menu_exit" android:icon="@drawable/ic_menu_exit" + android:showAsAction="ifRoom" + /> </menu> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index bdad7ae..3a58487 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -12,7 +12,6 @@ import org.torproject.android.settings.ProcessSettingsAsyncTask; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.wizard.ChooseLocaleWizardActivity; -import android.app.Activity; import android.app.AlertDialog; import android.app.NotificationManager; import android.content.ComponentName; @@ -36,9 +35,6 @@ import android.text.Layout; import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnLongClickListener; @@ -49,7 +45,13 @@ import android.widget.SlidingDrawer; import android.widget.TextView; import android.widget.Toast; -public class Orbot extends Activity implements TorConstants, OnLongClickListener +import com.actionbarsherlock.app.SherlockActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuInflater; +import com.actionbarsherlock.view.MenuItem; + + +public class Orbot extends SherlockActivity implements TorConstants, OnLongClickListener { /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget @@ -161,9 +163,10 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener * Create the UI Options Menu (non-Javadoc) * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) */ + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - MenuInflater inflater = getMenuInflater(); + MenuInflater inflater = getSupportMenuInflater(); inflater.inflate(R.menu.main, menu); mItemOnOff = menu.getItem(0); diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 46a2211..fd857fd 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -11,6 +11,8 @@ import org.torproject.android.TorConstants; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorTransProxy; +import com.actionbarsherlock.app.SherlockPreferenceActivity; + import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; @@ -27,7 +29,7 @@ import android.widget.Toast; public class SettingsPreferences - extends PreferenceActivity implements OnPreferenceClickListener { + extends SherlockPreferenceActivity implements OnPreferenceClickListener { private CheckBoxPreference prefCBTransProxy = null; private CheckBoxPreference prefcBTransProxyAll = null;

1 0

[orbot/master] shortened up/down indicator labels
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit c47713cfb32c3b94bdbc3d582915e3f9ccd8fa8b Author: n8fr8 <nathan(a)freitas.net> Date: Sun Oct 21 15:33:22 2012 +0530 shortened up/down indicator labels --- res/values/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 00f1dca..1fe6b81 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,8 +31,8 @@ <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> -<string name="main_layout_download">Download (speed/total)</string> -<string name="main_layout_upload">Upload (speed/total)</string> +<string name="main_layout_download">Down (kbps/kb)</string> +<string name="main_layout_upload">Up (kbps/kb)</string> <string name="button_help">Help</string> <string name="button_close">Close</string>

1 0