August 2013 - tor-commits - lists.torproject.org

[orbot/master] remove unneeded view and share intents
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit cfb047314aae265c3453b9e49b68d14fbd63a886 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:33:44 2013 -0400 remove unneeded view and share intents --- AndroidManifest.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 45b45a0..925b78a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -28,12 +28,13 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> @@ -51,6 +52,7 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> +  </activity>

1 0

[orbot/master] disable share/send feature for this release
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit cdd75f31afc47cbedbaf7a0b49832be9b6466da2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:33:55 2013 -0400 disable share/send feature for this release --- src/org/torproject/android/Orbot.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 0c47441..dcd2e00 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -495,6 +495,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } + /* else if (Intent.ACTION_SEND.equals(action)) { Uri dataUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); @@ -513,7 +514,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick // TODO Auto-generated catch block e.printStackTrace(); } - } + }*/ else {

1 0

[orbot/master] fix for notifications and debug option for "airplane mode"
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 2c278f3d5267ba5d2ba42bea741224effaf6b254 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:34:03 2013 -0400 fix for notifications and debug option for "airplane mode" --- src/org/torproject/android/TorConstants.java | 1 + src/org/torproject/android/service/TorService.java | 52 +++++++++++--------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 2574c6a..592b6ce 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -50,4 +50,5 @@ public interface TorConstants { public final static String PREF_DEFAULT_LOCALE = "pref_default_locale"; + public final static String PREF_DISABLE_NETWORK = "pref_disable_network"; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ede49a0..a98a603 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -51,6 +51,7 @@ import android.os.IBinder; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; +import android.support.v4.app.NotificationCompat; import android.util.Log; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler @@ -1053,33 +1054,32 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } + NotificationCompat.Builder mNotifyBuilder; + private void startNotification (String message, boolean persistent) { - Notification notice = new Notification(R.drawable.ic_stat_tor, getString(R.string.status_activated), System.currentTimeMillis()); - - Intent intent = new Intent(TorService.this, Orbot.class); - - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - - //This method is deprecated. Use Notification.Builder instead. - notice.setLatestEventInfo(TorService.this,getString(R.string.app_name), message, pendIntent); - - if (persistent) + if (mNotifyBuilder == null) { - notice.flags |= Notification.FLAG_NO_CLEAR; - notice.flags |= Notification.FLAG_ONGOING_EVENT; + mNotifyBuilder = new NotificationCompat.Builder(this) + .setContentTitle(getString(R.string.app_name)) + .setContentText( getString(R.string.status_activated)) + .setSmallIcon(R.drawable.ic_stat_tor); - startForeground(NOTIFY_ID,notice); + Intent intent = new Intent(TorService.this, Orbot.class); + PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - } - else - { - mNotificationManager.notify(NOTIFY_ID,notice); + mNotifyBuilder.setContentIntent(pendIntent); + + + } + mNotifyBuilder.setOngoing(persistent); + mNotifyBuilder.setContentText(message); - } - + mNotificationManager.notify( + NOTIFY_ID, + mNotifyBuilder.getNotification()); } @@ -1156,11 +1156,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (read != lastRead || written != lastWritten) { StringBuilder sb = new StringBuilder(); - sb.append("Bandwidth: "); + sb.append(getString(R.string.bandwidth_)); + sb.append(" "); sb.append(formatCount(read)); - sb.append(" down / "); + sb.append(" "); + sb.append(getString(R.string.down)); + sb.append(" / "); sb.append(formatCount(written)); - sb.append(" up"); + sb.append(" "); + sb.append(getString(R.string.up)); if (mConnectivity && prefPersistNotifications) startNotification(sb.toString(),prefPersistNotifications); @@ -1592,7 +1596,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst mConnectivity = !intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false); - if (currentStatus == STATUS_ON) + boolean disableNetwork = mPrefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true); + + if (currentStatus == STATUS_ON && disableNetwork) { try { mBinder.updateConfiguration("DisableNetwork", mConnectivity ? "0" : "1", false);

1 0

[orbot/master] add resources for airplane mode/network disable
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 0a3cc50ce468679aa7c838bea2b81978cc9f0f09 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:34:27 2013 -0400 add resources for airplane mode/network disable --- res/values/strings.xml | 6 ++++++ res/xml/preferences.xml | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 9e07996..d2ea568 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -235,4 +235,10 @@ <string name="powered_by">powered by The Tor Project </string> <string name="btn_save_settings">Save Settings</string> <string name="no_internet_connection_tor">No internet connection; Tor is on standby...</string> + <string name="bandwidth_">Bandwidth:</string> + <string name="down">down</string> + <string name="up">up</string> + + <string name="pref_disable_network_title">Network Auto-Sleep</string> + <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 2f92046..dd0e49a 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -216,6 +216,15 @@ android:summary="@string/pref_use_sys_iptables_summary" android:enabled="true" android:title="@string/pref_use_sys_iptables_title"/> + +<CheckBoxPreference +android:defaultValue="false" +android:key="pref_disable_network" +android:summary="@string/pref_disable_network_summary" +android:enabled="true" +android:title="@string/pref_disable_network_title"/> + + <!-- <CheckBoxPreference android:defaultValue="false"

1 0

[orbot/master] update tor to tor-0.2.4.16-rc
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 79e6eecb5f33fea69598d263630922346681ee92 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:35:13 2013 -0400 update tor to tor-0.2.4.16-rc --- res/raw/tor.mp3 | Bin 2120597 -> 2120561 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 3b1bb3b..74fde28 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ

1 0

[orbot/master] update torctrl jar
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 2cfd6af6c55ca0b43562aa134a258b2ada5ab294 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:35:24 2013 -0400 update torctrl jar --- libs/jtorctl.jar | Bin 14736 -> 14736 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index b6393b9..402480a 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ

1 0

[orbot/master] add our new icon source CC license link
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 3d387af744df2be22e9ea54aba01f96be3b1e605 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:17:46 2013 -0400 add our new icon source CC license link --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 5a84854..d9d62ef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -36,3 +36,5 @@ in TorTransProxy for handling the "transproxy all" mode of operation. Before certain system processes were leaking traffic, and this was also detected by his excellent auditing. +We found a nice new power button vector set here under the CC license: +http://vector4free.com/vector/free-vector-power-buttons/ \ No newline at end of file

1 0

[orbot/master] updates to graphics, layouts and strings
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 9a2a9897def3f79a25765e1a50b44f0716024457 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:17:11 2013 -0400 updates to graphics, layouts and strings --- res/drawable/bgtitanium.jpg | Bin 40884 -> 0 bytes res/drawable/icon_orweb.png | Bin 8783 -> 6596 bytes res/drawable/toroff.png | Bin 35872 -> 67176 bytes res/drawable/toron.png | Bin 60598 -> 74095 bytes res/drawable/torstarting.png | Bin 53000 -> 74011 bytes res/layout-land/layout_main.xml | 30 +++++++++++++++++++++++++----- res/layout/layout_log.xml | 5 ++--- res/layout/layout_main.xml | 31 ++++++++++++++++++++++--------- res/layout/layout_wizard_proxy_help.xml | 6 +++++- res/layout/layout_wizard_tips.xml | 3 ++- res/values/strings.xml | 3 +-- res/values/theme.xml | 1 - 12 files changed, 57 insertions(+), 22 deletions(-) diff --git a/res/drawable/bgtitanium.jpg b/res/drawable/bgtitanium.jpg deleted file mode 100755 index 1047e4c..0000000 Binary files a/res/drawable/bgtitanium.jpg and /dev/null differ diff --git a/res/drawable/icon_orweb.png b/res/drawable/icon_orweb.png index 679986f..a9077b8 100755 Binary files a/res/drawable/icon_orweb.png and b/res/drawable/icon_orweb.png differ diff --git a/res/drawable/toroff.png b/res/drawable/toroff.png index a5cfb97..4dceca3 100644 Binary files a/res/drawable/toroff.png and b/res/drawable/toroff.png differ diff --git a/res/drawable/toron.png b/res/drawable/toron.png index 94ad237..5f6eed6 100644 Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png index 0d05e42..31c4dd7 100644 Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml index ec3d4ed..595495e 100644 --- a/res/layout-land/layout_main.xml +++ b/res/layout-land/layout_main.xml @@ -36,7 +36,10 @@ android:layout_marginRight="0px" android:gravity="right" android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> + android:textColor="#cccccc" + android:fontFamily="sans-serif-light" + + /> </RelativeLayout> <LinearLayout android:gravity="center_vertical" @@ -64,6 +67,9 @@ android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:textColor="#ffffff" + android:maxLines="1" + android:fontFamily="sans-serif-light" + /> </LinearLayout> @@ -96,7 +102,10 @@ android:textSize="15sp" android:text="@string/main_layout_download" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + + /> <TextView android:id="@+id/trafficLabelUp" android:textColor="#FFFFFFFF" @@ -106,7 +115,10 @@ android:text="@string/main_layout_upload" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + + /> </RelativeLayout> <RelativeLayout @@ -126,7 +138,10 @@ android:layout_alignParentLeft="true" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + + /> <TextView android:id="@+id/trafficUp" android:textColor="#FF00B627" @@ -135,7 +150,10 @@ android:layout_alignParentRight="true" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + + /> </RelativeLayout> <TextView android:id="@+id/orbotLog" @@ -147,6 +165,8 @@ android:layout_alignParentLeft="true" android:textIsSelectable="true" android:layout_below="@+id/rowTrafficData" + android:fontFamily="sans-serif-light" + /> </RelativeLayout> </RelativeLayout> diff --git a/res/layout/layout_log.xml b/res/layout/layout_log.xml index d3bc32a..b9c7623 100644 --- a/res/layout/layout_log.xml +++ b/res/layout/layout_log.xml @@ -3,8 +3,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/bgtitanium"> + android:layout_height="fill_parent"> <RelativeLayout android:id="@+id/layoutHeaderMain" android:layout_width="fill_parent" @@ -36,7 +35,7 @@ <ScrollView android:orientation="vertical" android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/logScrollView" - xmlns:android="http://schemas.android.com/apk/res/android"> + > <TextView android:id="@+id/messageLog" android:layout_height="wrap_content" diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index cfb0324..762e458 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -32,7 +32,10 @@ android:layout_marginRight="0px" android:gravity="right" android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> + android:textColor="#cccccc" + android:fontFamily="sans-serif-light" + + /> </RelativeLayout> <LinearLayout android:gravity="center_vertical|center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" @@ -52,9 +55,13 @@ android:gravity="center_horizontal" android:textStyle="bold" android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_height="50sp" android:layout_marginBottom="20dp" + android:layout_marginLeft="30dp" + android:layout_marginRight="30dp" android:textColor="#ffffff" + android:maxLines="2" + android:fontFamily="sans-serif-light" /> @@ -76,7 +83,8 @@ android:textSize="15sp" android:text="@string/main_layout_download" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" /> <TextView android:id="@+id/trafficLabelUp" android:textColor="#FFFFFFFF" @@ -86,7 +94,8 @@ android:text="@string/main_layout_upload" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" /> </RelativeLayout> <RelativeLayout @@ -106,7 +115,9 @@ android:layout_alignParentLeft="true" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + /> <TextView android:id="@+id/trafficUp" android:textColor="#FF00B627" @@ -115,7 +126,9 @@ android:layout_alignParentRight="true" android:textSize="15sp" android:gravity="center_vertical" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="sans-serif-light" + /> </RelativeLayout> </LinearLayout> @@ -123,7 +136,7 @@ android:layout_width="fill_parent" android:id="@+id/SlidingDrawer" android:handle="@+id/slideButton" - android:content="@+id/trafficRow" + android:content="@+id/trafficLog" android:padding="10dip" android:layout_height="fill_parent" android:orientation="vertical" @@ -135,7 +148,7 @@ android:layout_height="wrap_content" android:text="@string/menu_log" ></Button> - <RelativeLayout android:id="@+id/trafficRow" + <RelativeLayout android:id="@+id/trafficLog" android:gravity="top" android:layout_width="fill_parent" android:visibility="invisible" @@ -152,9 +165,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@+id/rowTrafficUp" android:layout_marginTop="10dp" android:textIsSelectable="true" + android:fontFamily="sans-serif-light" /> </RelativeLayout> </SlidingDrawer> diff --git a/res/layout/layout_wizard_proxy_help.xml b/res/layout/layout_wizard_proxy_help.xml index cedc385..d5e1d56 100644 --- a/res/layout/layout_wizard_proxy_help.xml +++ b/res/layout/layout_wizard_proxy_help.xml @@ -14,7 +14,11 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:padding="3px"> -<TextView android:text="@string/wizard_proxy_help_msg" android:textColor="#ffffff" android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> +<TextView android:text="@string/wizard_proxy_help_msg" android:textColor="#ffffff" + android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" + + + ></TextView> diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index d203889..c7d1f98 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -112,6 +112,7 @@ android:drawableLeft="@drawable/ic_twitter" android:text="@string/wizard_tips_twitter" /> +  </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index d2ea568..bca3086 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -107,7 +107,7 @@ <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</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://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</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> @@ -238,7 +238,6 @@ <string name="bandwidth_">Bandwidth:</string> <string name="down">down</string> <string name="up">up</string> - <string name="pref_disable_network_title">Network Auto-Sleep</string> <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> </resources> diff --git a/res/values/theme.xml b/res/values/theme.xml index efc15c4..6e7cc53 100644 --- a/res/values/theme.xml +++ b/res/values/theme.xml @@ -3,7 +3,6 @@ <resources> <color name="custom_theme_color">#333</color> <style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar"> - <item name="android:windowBackground">@drawable/bgtitanium</item> <item name="android:windowNoTitle">true</item> </style> </resources>

1 0

[orbot/master] make the "check" button a bit smarter
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit eb1c6b0829f7a47e566f8f82ba76666a91da8a44 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:17:20 2013 -0400 make the "check" button a bit smarter --- src/org/torproject/android/Orbot.java | 112 +++++++++++++++++--- .../android/service/TorServiceConstants.java | 2 +- .../torproject/android/wizard/TipsAndTricks.java | 3 +- 3 files changed, 98 insertions(+), 19 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index dcd2e00..9f4229b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -11,19 +11,23 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.settings.ProcessSettingsAsyncTask; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.wizard.ChooseLocaleWizardActivity; +import org.torproject.android.wizard.TipsAndTricks; import android.app.AlertDialog; import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.drm.DrmStore.Action; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -72,7 +76,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick ITorService mService = null; private boolean autoStartFromIntent = false; - SharedPreferences prefs; + SharedPreferences mPrefs; public static Orbot currentInstance = null; @@ -96,8 +100,8 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } */ - prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - prefs.registerOnSharedPreferenceChangeListener(this); + mPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + mPrefs.registerOnSharedPreferenceChangeListener(this); Orbot.setCurrent(this); @@ -365,9 +369,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private void enableHiddenServicePort (int hsPort) { - Editor pEdit = prefs.edit(); + Editor pEdit = mPrefs.edit(); - String hsPortString = prefs.getString("pref_hs_ports", ""); + String hsPortString = mPrefs.getString("pref_hs_ports", ""); if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1) hsPortString += ',' + hsPort; @@ -379,7 +383,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick pEdit.commit(); - String onionHostname = prefs.getString("pref_hs_hostname",""); + String onionHostname = mPrefs.getString("pref_hs_hostname",""); while (onionHostname.length() == 0) { @@ -395,7 +399,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick e.printStackTrace(); } - onionHostname = prefs.getString("pref_hs_hostname",""); + onionHostname = mPrefs.getString("pref_hs_hostname",""); } Intent nResult = new Intent(); @@ -520,13 +524,13 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick - boolean showWizard = prefs.getBoolean("show_wizard",true); + boolean showWizard = mPrefs.getBoolean("show_wizard",true); if (showWizard) { - Editor pEdit = prefs.edit(); + Editor pEdit = mPrefs.edit(); pEdit.putBoolean("show_wizard",false); pEdit.commit(); @@ -566,15 +570,89 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(String url) + private void openBrowser(final String browserLaunchUrl) { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); + boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); + boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); + + if (isOrwebInstalled) + { + startIntent("info.guardianproject.browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); + } + else if (isTransProxy) + { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + else + { + AlertDialog aDialog = new AlertDialog.Builder(Orbot.this) + .setIcon(R.drawable.icon) + .setTitle("Install apps?") + .setMessage("It doesn't seem like you have Orweb installed. Want help with that, or should we just open the browser?") + .setPositiveButton(android.R.string.ok, new OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + //prompt to install Orweb + Intent intent = new Intent(Orbot.this,TipsAndTricks.class); + startActivity(intent); + + } + + }) + .setNegativeButton(android.R.string.no, new OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + + } + + }) + .show(); + + } } + private void startIntent (String pkg, String action, Uri data) + { + Intent i; + PackageManager manager = getPackageManager(); + try { + i = manager.getLaunchIntentForPackage(pkg); + if (i == null) + throw new PackageManager.NameNotFoundException(); + i.setAction(action); + i.setData(data); + startActivity(i); + } catch (PackageManager.NameNotFoundException e) { + + } + } + private boolean appInstalledOrNot(String uri) + { + PackageManager pm = getPackageManager(); + boolean app_installed = false; + try + { + pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + app_installed = true; + } + catch (PackageManager.NameNotFoundException e) + { + app_installed = false; + } + return app_installed ; +} /* * Show the help view - a popup dialog @@ -583,7 +661,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick { - Editor pEdit = prefs.edit(); + Editor pEdit = mPrefs.edit(); pEdit.putBoolean("wizardscreen1",true); pEdit.commit(); startActivityForResult(new Intent(getBaseContext(), ChooseLocaleWizardActivity.class), 1); @@ -681,12 +759,12 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick appendLogTextAndScroll(torServiceMsg); } - boolean showFirstTime = prefs.getBoolean("connect_first_time",true); + boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); if (showFirstTime) { - Editor pEdit = prefs.edit(); + Editor pEdit = mPrefs.edit(); pEdit.putBoolean("connect_first_time",false); @@ -1073,7 +1151,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick Configuration config = getResources().getConfiguration(); - String lang = prefs.getString(PREF_DEFAULT_LOCALE, ""); + String lang = mPrefs.getString(PREF_DEFAULT_LOCALE, ""); if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang)) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index b4a39a6..c12d492 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.15-rc"; + public static final String BINARY_TOR_VERSION = "0.2.4.16-rc"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 97b8d9a..49bc311 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -130,6 +130,7 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); + /** btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); btnLink.setOnClickListener(new OnClickListener() { @@ -141,7 +142,7 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); - + */ Button back = ((Button)findViewById(R.id.btnWizard1));

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 19 Aug '13

19 Aug '13

commit 469f90b1c53c0650a80b3a938b15048bc0776ec8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 19 15:15:22 2013 +0000 Update translations for tsum_completed --- pt_BR/short-user-manual_pt_BR_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/short-user-manual_pt_BR_noimg.xhtml b/pt_BR/short-user-manual_pt_BR_noimg.xhtml index 8ead44e..e9f89b5 100644 --- a/pt_BR/short-user-manual_pt_BR_noimg.xhtml +++ b/pt_BR/short-user-manual_pt_BR_noimg.xhtml @@ -114,7 +114,7 @@ sub 2048R/EB399FD7 2003-10-16 <h3 id="vidalia-asks-for-a-password">Vidalia requer uma senha</h3> <p>Normalmente, nenhuma senha é necessária para iniciar o Vidalia. Se uma senha for requerida, é provável que você tenha sido afetado por um desses problemas:</p> <p><strong> O Vidalia e o Tor já estão sendo executados</strong>: Esta situação pode acontecer se você tiver instalado o Vidalia e agora você estiver tentando executar o Tor Browser Bundle. Neste caso, feche o Vidalia e o Tor antigos antes de executar este segundo.</p> - <p><strong>Vidalia deu erro, mas deixou o Tor rodando</strong>: Se a caixa que pede por uma senha possui um botão de Reset, você pode clicar no botão e o Vidalia vai reiniciar o Tor com uma nova senha de controle. Se você não ver o botão de Reset, ou se o Vidalia não conseguiu reiniciar o Tor para você: vá no seu gerenciador de processos ou gerenciador de tarefas, e termine o processo do Tor. Então use o Vidalia para reiniciar o Tor.</p> + <p><strong>Vidalia travou, mas deixou o Tor rodando</strong>: Se a caixa que pede por uma senha possuir um botão de Reset, clique nesse botão e o Vidalia reiniciará o Tor com uma nova senha de controle. Se você não vir o botão de Reset, ou se o Vidalia não tiver reiniciadoTor, abra o seu gerenciador de processos ou gerenciador de tarefas, e finalize o processo do Tor. Em seguida, use o Vidalia para reiniciar o Tor.</p> <p>Para mais informações, consulte o endereço <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> no site do Projeto Tor</p> <h3 id="flash-does-not-work">Flash não funciona</h3> <p>Por razões de segurança, Flash, Java e outros plugins são desabilitados para o Tor. Estes plugins funcionam independemente do Firefox e podem realizar operações no seu computador, que põem fim ao seu anonimato.</p>

1 0