From df492cfd0ec0165916ff016179f812cf8f30f320 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 Apr 2023 15:55:50 +0200
Subject: [PATCH] Fix lint warnings.

---
 .../android/libraries/androidutils/system/SystemUtils.kt  | 8 +++++---
 .../permissions/impl/DefaultPermissionsPresenter.kt       | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
index 8f01f28545..5f18f46827 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.androidutils.system
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -77,6 +78,7 @@ fun Context.getApplicationLabel(packageName: String): String {
  * Note: If the user finally does not grant the permission, PushManager.isBackgroundSyncAllowed()
  * will return false and the notification privacy will fallback to "LOW_DETAIL".
  */
+@SuppressLint("BatteryLife")
 fun requestDisablingBatteryOptimization(activity: Activity, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val intent = Intent()
     intent.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
@@ -114,9 +116,9 @@ fun startNotificationSettingsIntent(context: Context, activityResultLauncher: Ac
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
         intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
     } else {
-        intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-        intent.putExtra("app_package", context.packageName)
-        intent.putExtra("app_uid", context.applicationInfo?.uid)
+        intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        intent.data = Uri.fromParts("package", context.packageName, null)
     }
     activityResultLauncher.launch(intent)
 }
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
index c422cd1ec9..9e91869549 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
@@ -58,7 +58,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor(
     override fun present(): PermissionsState {
         val localCoroutineScope = rememberCoroutineScope()
 
-        // To reset the store: resetStore()
+        // To reset the store: ResetStore()
 
         val isAlreadyDenied: Boolean by permissionsStore
             .isPermissionDenied(permission)
@@ -129,7 +129,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor(
 
     /*
     @Composable
-    private fun resetStore() {
+    private fun ResetStore() {
         LaunchedEffect(this@DefaultPermissionsPresenter) {
             launch {
                 permissionsStore.resetStore()