Merge branch 'issues/2595' of github.com:ooni/probe-android into issu…

…es/2595-database-actions
ooni · Dec 21, 2023 · be8a80a · be8a80a
2 parents 8a354ba + db37b06
commit be8a80a
Show file tree

Hide file tree

Showing 55 changed files with 2,008 additions and 873 deletions.
diff --git a/.github/workflows/firebase-app-distribution.yml b/.github/workflows/firebase-app-distribution.yml
@@ -0,0 +1,25 @@
+name: Build & upload to Firebase App Distribution
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: build release
+        run: ./gradlew clean assembleDevFullDebug
+      - name: upload artifact to Firebase App Distribution
+        uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
+        with:
+          appId: ${{secrets.FIREBASE_APP_ID}}
+          serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+          groups: testers
+          file: app/build/outputs/apk/devFull/debug/app-dev-full-debug.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'org.openobservatory.ooniprobe'
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.targetSdk.get().toInteger()
-        versionName '3.8.5'
-        versionCode 107
+        versionName '3.8.5.1'
+        versionCode 108
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'
@@ -107,7 +107,6 @@ dependencies {
 
 // AndroidX
     implementation libs.androidx.appcompat
-    //implementation libs.androidx.core
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.lifecycle.process
     implementation libs.androidx.preference

diff --git a/app/src/fdroid/res/xml/preferences_global.xml b/app/src/fdroid/res/xml/preferences_global.xml
@@ -2,30 +2,27 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:key="@string/preferences"
 	android:title="@string/Settings_Title">
-<PreferenceScreen
-		android:icon="@drawable/automated_testing"
-		android:key="@string/automated_testing"
-		android:title="@string/Settings_AutomatedTesting_Label">
-		<SwitchPreferenceCompat
-			android:defaultValue="false"
-			android:key="@string/automated_testing_enabled"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_wifionly"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_charging"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly" />
-		<PreferenceCategory android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer" />
-	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/test_options"
 		android:key="@string/test_options"
 		android:title="@string/Settings_TestOptions_Label">
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="@string/automated_testing_enabled"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_wifionly"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_charging"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly"
+            app:iconSpaceReserved="false" />
 		<PreferenceScreen
 			android:key="@string/Settings_Websites_Categories_Label"
 			android:title="@string/Settings_Websites_Categories_Label"
@@ -228,6 +225,9 @@
 			android:key="@string/max_runtime"
 			android:title="@string/Settings_Websites_MaxRuntime"
 			app:iconSpaceReserved="false" />
+        <PreferenceCategory
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer"
+            app:iconSpaceReserved="false" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/privacy"