[or-cvs] r23224: {projects} updates app version in localized strings; fixed FC/NPE issue (in projects/android/trunk/Orbot: . res/values res/values-ar res/values-de res/values-es res/values-fa res/values-nb res/values-nl res/values-pl res/values-pt res/values-ru res/values-sv res/values-zh src/org/torproject/android)
Nathan Freitas
nathan at freitas.net
Sat Sep 18 12:38:16 UTC 2010
Author: n8fr8
Date: 2010-09-18 12:38:15 +0000 (Sat, 18 Sep 2010)
New Revision: 23224
Modified:
projects/android/trunk/Orbot/AndroidManifest.xml
projects/android/trunk/Orbot/AndroidManifest.xml.production
projects/android/trunk/Orbot/res/values-ar/strings.xml
projects/android/trunk/Orbot/res/values-de/strings.xml
projects/android/trunk/Orbot/res/values-es/strings.xml
projects/android/trunk/Orbot/res/values-fa/strings.xml
projects/android/trunk/Orbot/res/values-nb/strings.xml
projects/android/trunk/Orbot/res/values-nl/strings.xml
projects/android/trunk/Orbot/res/values-pl/strings.xml
projects/android/trunk/Orbot/res/values-pt/strings.xml
projects/android/trunk/Orbot/res/values-ru/strings.xml
projects/android/trunk/Orbot/res/values-sv/strings.xml
projects/android/trunk/Orbot/res/values-zh/strings.xml
projects/android/trunk/Orbot/res/values/strings.xml
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java
Log:
updates app version in localized strings; fixed FC/NPE issue on sublaunch from notification bar
Modified: projects/android/trunk/Orbot/AndroidManifest.xml
===================================================================
--- projects/android/trunk/Orbot/AndroidManifest.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/AndroidManifest.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
- <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
<activity android:name=".Orbot"
android:theme="@android:style/Theme.NoTitleBar">
@@ -41,6 +41,7 @@
</service>
+
</application>
<uses-sdk android:minSdkVersion="3"/>
Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production
===================================================================
--- projects/android/trunk/Orbot/AndroidManifest.xml.production 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2010-09-18 12:38:15 UTC (rev 23224)
@@ -40,13 +40,6 @@
</intent-filter>
</service>
- <receiver android:name=".OnBootReceiver">
- <intent-filter>
- <action
- android:name="android.intent.action.BOOT_COMPLETED" />
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- </receiver>
</application>
Modified: projects/android/trunk/Orbot/res/values/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,8 @@
<resources>
<string name="pref_hs_group">Hidden Services</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
+
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
@@ -101,8 +102,8 @@
<string name="wizard_final">Orbot is ready!</string>
<string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
- <string name="otrchat_apk_url">http://github.com/downloads/guardianproject/OtRChat/OtRChat-0.0.1-alpha-build6a.apk</string>
- <string name="orweb_apk_url">http://github.com/downloads/guardianproject/Orweb/Orweb-0.0.1c.apk.apk</string>
+ <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
+ <string name="orweb_apk_url">https://guardianproject/getorweb</string>
<!-- END Welcome Wizard strings (DJH) -->
Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ar/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">خدمات خفية</string>
<string name="app_name">اوربوت (Orbot)</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-de/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-de/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-de/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">Versteckte Dienste</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-es/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-es/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-es/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Orbot</string>
- <string name="app_version">0.0.8</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-fa/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">سرويس هاي مخفي</string>
<string name="app_name">اوربات</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-nb/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-nb/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-nb/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Orbot</string>
- <string name="app_version">0.0.8</string>
+ <string name="app_version">1.0.4</string>
+
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-nl/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">Verborgen diensten</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-pl/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">Usługi ukryte</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-pt/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-pt/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-pt/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Orbot</string>
- <string name="app_version">0.0.8</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ru/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">Скрытые сервисы</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-sv/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-sv/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-sv/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Orbot</string>
- <string name="app_version">0.0.8</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-zh/strings.xml 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2010-09-18 12:38:15 UTC (rev 23224)
@@ -2,7 +2,7 @@
<resources>
<string name="pref_hs_group">Hidden Services</string>
<string name="app_name">Orbot</string>
- <string name="app_version">1.0.2</string>
+ <string name="app_version">1.0.4</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===================================================================
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2010-09-18 12:38:15 UTC (rev 23224)
@@ -319,9 +319,14 @@
super.onResume();
-
+ if (getIntent() == null)
+ return;
+
String action = getIntent().getAction();
+ if (action == null)
+ return;
+
if (action.equals("org.torproject.android.REQUEST_HS_PORT"))
{
Modified: projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java
===================================================================
--- projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java 2010-09-17 21:32:21 UTC (rev 23223)
+++ projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java 2010-09-18 12:38:15 UTC (rev 23224)
@@ -379,6 +379,7 @@
LayoutInflater li = LayoutInflater.from(context);
View view = li.inflate(R.layout.layout_about, null);
+
TextView versionName = (TextView)view.findViewById(R.id.versionName);
versionName.setText(R.string.app_version);
More information about the tor-commits
mailing list