Merge pull request #591 from ooni/issue/1989-update

Fix: Inconsistent behavior opening preference intent screens.
ooni · Sep 10, 2023 · 907aa0d · 907aa0d
2 parents 41eb5f5 + 7e0b657
commit 907aa0d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,6 +14,7 @@ android {
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'
+        resValue "string", "APP_ID", 'org.openobservatory.ooniprobe'
 		resValue "string", "APP_NAME", "OONI Probe"
 		buildConfigField 'String', 'SOFTWARE_NAME', 'BASE_SOFTWARE_NAME+IS_DEBUG'
 		buildConfigField 'String', 'COUNTLY_KEY', '"146836f41172f9e3287cab6f2cc347de3f5ddf3b"'
@@ -65,6 +66,7 @@ android {
             versionNameSuffix "-beta.1"
             versionCode versionCodeDate()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-dev"'
+            resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.dev'
             resValue "string", "APP_NAME", "OONI Dev"
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }
@@ -74,6 +76,7 @@ android {
             versionNameSuffix "-experimental.1"
             versionCode versionCodeDate()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-experimental"'
+            resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.experimental'
             resValue "string", "APP_NAME", "OONI Exp"
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }

diff --git a/app/src/dev/res/values/untranslatable.xml b/app/src/dev/res/values/untranslatable.xml
diff --git a/app/src/experimental/res/values/untranslatable.xml b/app/src/experimental/res/values/untranslatable.xml
diff --git a/app/src/fdroid/res/xml/preferences_global.xml b/app/src/fdroid/res/xml/preferences_global.xml
@@ -355,7 +355,9 @@
 			app:iconSpaceReserved="false"
 			android:key="logs"
 			android:title="@string/Settings_Advanced_RecentLogs">
-			<intent android:action="@string/preference_intent_log_activity" />
+			<intent
+				android:targetPackage="@string/APP_ID"
+				android:targetClass="@string/preference_intent_log_activity"/>
 		</PreferenceScreen>
 		<SwitchPreferenceCompat
 			android:defaultValue="false"
@@ -378,7 +380,9 @@
 		android:icon="@drawable/proxy"
 		android:key="@string/ooni_backend_proxy"
 		android:title="@string/Settings_Proxy_Label">
-		<intent	android:action="@string/preference_intent_proxy_activity" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_proxy_activity"/>
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/send_email"
@@ -388,6 +392,8 @@
 		android:icon="@drawable/about_ooni"
 		android:key="@string/about_ooni"
 		android:title="@string/Settings_About_Label">
-		<intent android:action="@string/preference_intent_about_ooni" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_about_ooni" />
 	</PreferenceScreen>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_global.xml b/app/src/main/res/xml/preferences_global.xml
@@ -348,7 +348,9 @@
 		android:icon="@drawable/proxy"
 		android:key="@string/ooni_backend_proxy"
 		android:title="@string/Settings_Proxy_Label">
-		<intent	android:action="@string/preference_intent_proxy_activity" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_proxy_activity"/>
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/advanced"
@@ -373,7 +375,9 @@
 			app:iconSpaceReserved="false"
 			android:key="logs"
 			android:title="@string/Settings_Advanced_RecentLogs">
-			<intent android:action="@string/preference_intent_log_activity" />
+			<intent
+				android:targetPackage="@string/APP_ID"
+				android:targetClass="@string/preference_intent_log_activity"/>
 		</PreferenceScreen>
 		<SwitchPreferenceCompat
 			android:defaultValue="false"
@@ -400,6 +404,8 @@
 		android:icon="@drawable/about_ooni"
 		android:key="@string/about_ooni"
 		android:title="@string/Settings_About_Label">
-		<intent android:action="@string/preference_intent_about_ooni" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_about_ooni" />
 	</PreferenceScreen>
 </PreferenceScreen>