From c30862c0da9c54af6814e49ce48ca2cb05b610f8 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 10 Feb 2024 20:55:48 +0100
Subject: [PATCH] Tests can now be executed again on pre-Android 12.

---
 .../java/de/dennisguse/opentracks/TestUtil.java     |  5 ++++-
 src/main/AndroidManifest.xml                        | 13 +++++++++----
 src/main/java/de/dennisguse/opentracks/Startup.java |  2 +-
 .../opentracks/settings/PreferencesUtils.java       |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java
index 947c6084a..184a5ac18 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java
@@ -11,6 +11,9 @@ public class TestUtil {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS);
         }
-        return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT);
+        }
+        return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index c0b67324d..ece98263e 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -41,8 +41,10 @@ limitations under the License.
         android:required="false" />
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"
+        android:minSdkVersion="34" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"
+        android:minSdkVersion="34" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -59,10 +61,13 @@ limitations under the License.
     <uses-permission
         android:name="android.permission.BLUETOOTH_SCAN"
         android:usesPermissionFlags="neverForLocation"
+        android:minSdkVersion="31"
         tools:targetApi="s" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"
+        android:minSdkVersion="31" />
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"
+        android:minSdkVersion="33" />
 
     <application
         android:name=".Startup"
diff --git a/src/main/java/de/dennisguse/opentracks/Startup.java b/src/main/java/de/dennisguse/opentracks/Startup.java
index d6e188936..3e381b05d 100644
--- a/src/main/java/de/dennisguse/opentracks/Startup.java
+++ b/src/main/java/de/dennisguse/opentracks/Startup.java
@@ -30,7 +30,7 @@ public class Startup extends Application {
         // Include version information into stack traces.
         Log.i(TAG, BuildConfig.APPLICATION_ID + "; BuildType: " + BuildConfig.BUILD_TYPE + "; VersionName: " + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_NAME_FULL + " VersionCode: " + BuildConfig.VERSION_CODE);
 
-        PreferencesUtils.initPreferences(this, getResources());
+        PreferencesUtils.initPreferences(this);
         // Set default values of preferences on first start.
         PreferencesUtils.resetPreferences(this, false);
         PreferencesUtils.applyDefaultUnit();
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index cb8ec5e28..a93d2f97c 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -75,8 +75,8 @@ public class PreferencesUtils {
     /**
      * Must be called during application startup.
      */
-    public static void initPreferences(final Context context, final Resources resources) {
-        PreferencesUtils.resources = resources;
+    public static void initPreferences(final Context context) {
+        PreferencesUtils.resources = context.getResources();
         PreferencesUtils.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         PreferencesOpenHelper.newInstance(PREFERENCES_VERSION).check();