From c47d5a4113c870ba2e1394ec02ff9269dca9ee10 Mon Sep 17 00:00:00 2001
From: LLan <llan@noreply.codeberg.org>
Date: Wed, 8 Jan 2025 18:06:23 +0100
Subject: [PATCH] Cleanup

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../activities/SettingsActivity.java          |  4 ++--
 .../healthconnect/HealthConnectUtils.java     | 23 ++++++++-----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3494d6506..cee5337a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -104,7 +104,6 @@
     <uses-permission android:name="android.permission.health.READ_STEPS"/>
     <uses-permission android:name="android.permission.health.WRITE_STEPS"/>
     <uses-sdk tools:overrideLibrary="androidx.health.connect.client"/>
-<!--    <uses-sdk tools:overrideLibrary="androidx.health.connect.client" /> &lt;!&ndash; Override the library's minSdkVersion &ndash;&gt;-->
 
     <uses-feature
         android:name="android.hardware.bluetooth"
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index 3aea324ae..db7e84061 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -327,7 +327,7 @@ public class SettingsActivity extends AbstractSettingsActivityV2 {
             pref = findPreference(GBPrefs.EXPORT_HEALTH_CONNECT_ENABLED);
             if (pref != null) {
                 // (I don't know what Kotlin Continuation are used for, but they are needed
-                Continuation<Set<String>> continuationString =  new Continuation<Set<String>>() {
+                Continuation<Set<String>> continuationString = new Continuation<Set<String>>() {
                     @NotNull
                     @Override
                     public CoroutineContext getContext() {
@@ -346,7 +346,7 @@ public class SettingsActivity extends AbstractSettingsActivityV2 {
                     if ((boolean) exportHealthConnectEnabled) {
                         if(!grantedPermissions.containsAll(healthConnectUtils.requiredHealthConnectPermissions)) {
                             // If we weren't enabled at some point already, show Permission screen
-                            healthConnectUtils.healthConnectLauncherInit().launch(healthConnectUtils.requiredHealthConnectPermissions);
+                            healthConnectUtils.activityResultLauncher.launch(healthConnectUtils.requiredHealthConnectPermissions);
                         }
                     }
                     return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/HealthConnectUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/HealthConnectUtils.java
index 4daad0a3f..1fa6f7047 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/HealthConnectUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/healthconnect/HealthConnectUtils.java
@@ -52,22 +52,26 @@ import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 public class HealthConnectUtils {
     private static final Logger LOG = LoggerFactory.getLogger(HealthConnectUtils.class);
     private final PreferenceFragmentCompat preferenceFragmentCompat;
-    Class<StepsRecord> stepsRecordJavaClass = StepsRecord.class;
-    Class<HeartRateRecord> heartrateRecordJavaClass = HeartRateRecord.class;
-    KClass<StepsRecord> stepsRecordKClass = JvmClassMappingKt.getKotlinClass(stepsRecordJavaClass);
-    KClass<HeartRateRecord> heartrateRecordKClass = JvmClassMappingKt.getKotlinClass(heartrateRecordJavaClass);
-    public Set<String> requiredHealthConnectPermissions = Set.of(
+    public final ActivityResultLauncher<Set<String>> activityResultLauncher;
+    private final Class<StepsRecord> stepsRecordJavaClass = StepsRecord.class;
+    private final Class<HeartRateRecord> heartrateRecordJavaClass = HeartRateRecord.class;
+    private final KClass<StepsRecord> stepsRecordKClass = JvmClassMappingKt.getKotlinClass(stepsRecordJavaClass);
+    private final KClass<HeartRateRecord> heartrateRecordKClass = JvmClassMappingKt.getKotlinClass(heartrateRecordJavaClass);
+    public final Set<String> requiredHealthConnectPermissions = Set.of(
             HealthPermission.getReadPermission(stepsRecordKClass),
             HealthPermission.getWritePermission(stepsRecordKClass),
             HealthPermission.getReadPermission(heartrateRecordKClass),
             HealthPermission.getWritePermission(heartrateRecordKClass)
     );
 
-
     public ActivityResultContract<Set<String>, Set<String>> requestPermissionResultContract = PermissionController.createRequestPermissionResultContract();
 
     public HealthConnectUtils(PreferenceFragmentCompat fragmentCompat) {
         preferenceFragmentCompat = fragmentCompat;
+        activityResultLauncher = preferenceFragmentCompat.registerForActivityResult(
+                requestPermissionResultContract,
+                this::permissionCallback
+        );
     }
 
     @SuppressLint("RestrictedApi")
@@ -89,13 +93,6 @@ public class HealthConnectUtils {
         }
     }
 
-    public ActivityResultLauncher<Set<String>> healthConnectLauncherInit() {
-        return preferenceFragmentCompat.registerForActivityResult(
-            requestPermissionResultContract,
-            this::permissionCallback
-        );
-    }
-
     public HealthConnectClient healthConnectInit(Context context) {
         // First check if we can even use Health Connect
         int availabilityStatus = HealthConnectClient.getSdkStatus(context);