updates app version in localized strings; fixed FC/NPE issue on sublaunch from notification bar

svn:r23224

AndroidManifest.xml

@@ -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"/>

AndroidManifest.xml.production

@@ -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>

res/values-ar/strings.xml

@@ -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>

res/values-de/strings.xml

@@ -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>

res/values-es/strings.xml

@@ -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>

res/values-fa/strings.xml

@@ -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>

res/values-nb/strings.xml

@@ -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>

res/values-nl/strings.xml

@@ -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>

res/values-pl/strings.xml

@@ -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>

res/values-pt/strings.xml

@@ -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>

res/values-ru/strings.xml

@@ -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>

res/values-sv/strings.xml

@@ -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>

res/values-zh/strings.xml

@@ -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>

res/values/strings.xml

@@ -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) -->
 

src/org/torproject/android/Orbot.java

@@ -319,9 +319,14 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
 		super.onResume();
 		
 		
+		if (getIntent() == null)
+			return;
 		
 		String action = getIntent().getAction();
 		
+		if (action == null)
+			return;
+		
 		if (action.equals("org.torproject.android.REQUEST_HS_PORT"))
 		{
 			

src/org/torproject/android/WizardHelper.java

@@ -379,6 +379,7 @@ public class WizardHelper implements TorConstants {
 		
 		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);