Update: Koin-inject PowerManager

NeoApplications · Nov 8, 2024 · 9b017d8 · 9b017d8
1 parent 82cd135
commit 9b017d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/com/machiav3lli/backup/OABX.kt b/src/main/java/com/machiav3lli/backup/OABX.kt
@@ -93,6 +93,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
+import org.koin.java.KoinJavaComponent.get
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import java.util.concurrent.ConcurrentLinkedQueue
@@ -544,7 +545,7 @@ class OABX : Application() {
             if (aquire) {
                 traceDebug { "%%%%% $wakeLockTag wakelock aquire (before: $wakeLockNested)" }
                 if (wakeLockNested.accumulateAndGet(+1, Int::plus) == 1) {
-                    val pm = context.getSystemService(POWER_SERVICE) as PowerManager
+                    val pm : PowerManager = get(PowerManager::class.java)
                     theWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag)
                     theWakeLock?.acquire(60 * 60 * 1000L)
                     traceDebug { "%%%%% $wakeLockTag wakelock ACQUIRED" }
@@ -741,4 +742,5 @@ class OABX : Application() {
 val handlersModule = module {
     single { WorkHandler(get()) }
     single { ExportsHandler(get()) }
+    single { get<Context>().getSystemService(Context.POWER_SERVICE) as PowerManager }
 }
diff --git a/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt b/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt
@@ -20,7 +20,6 @@ package com.machiav3lli.backup.activities
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.os.PowerManager
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -113,7 +112,6 @@ class MainActivityX : BaseActivity() {
 
     private val mScope: CoroutineScope = MainScope()
     lateinit var navController: NavHostController
-    private lateinit var powerManager: PowerManager
 
     private lateinit var openDialog: MutableState<Boolean>
     private lateinit var dialogKey: MutableState<DialogKey?>
@@ -199,8 +197,6 @@ class MainActivityX : BaseActivity() {
             return
         }
 
-        powerManager = this.getSystemService(POWER_SERVICE) as PowerManager
-
         setContent {
 
             navController = rememberNavController()

diff --git a/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt b/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt
@@ -80,16 +80,16 @@ import com.machiav3lli.backup.utils.setBackupDir
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.koin.compose.koinInject
 import timber.log.Timber
 
 // TODO use rememberPermissionState to manage more permissions
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun PermissionsPage() {
+fun PermissionsPage(powerManager: PowerManager = koinInject()) {
     val context = LocalContext.current
     val mScope = CoroutineScope(Dispatchers.Main)
     val mainActivity = OABX.main!!
-    val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
     val openDialog = remember { mutableStateOf(false) }
     val dialogProp: MutableState<DialogMode> = remember {
         mutableStateOf(DialogMode.NONE)

diff --git a/src/main/java/com/machiav3lli/backup/utils/PermissionUtils.kt b/src/main/java/com/machiav3lli/backup/utils/PermissionUtils.kt
@@ -19,12 +19,13 @@ import androidx.core.app.ActivityCompat
 import com.machiav3lli.backup.BACKUP_DIRECTORY_INTENT
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.preferences.persist_ignoreBatteryOptimization
+import org.koin.java.KoinJavaComponent.get
 
 // Getters
 
 val Context.allPermissionsGranted: Boolean
     get() {
-        val powerManager = getSystemService(AppCompatActivity.POWER_SERVICE) as PowerManager
+        val powerManager: PowerManager = get(PowerManager::class.java)
         return hasStoragePermissions &&
                 isStorageDirSetAndOk &&
                 checkSMSMMSPermission &&