[fix]better at handling permissions

Steve-Mr · Sep 25, 2024 · 168ac9b · 168ac9b
1 parent 7559963
commit 168ac9b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/java/top/maary/oblivionis/OblivionisScreen.kt b/app/src/main/java/top/maary/oblivionis/OblivionisScreen.kt
@@ -28,6 +28,7 @@ fun OblivionisApp(
     ){
         composable (route = OblivionisScreen.Welcome.name) {
             WelcomeScreen (onPermissionFinished = {
+                actionViewModel.loadAlbums()
                 navController.navigate(OblivionisScreen.Entry.name) {
                     popUpTo(OblivionisScreen.Welcome.name) {
                         inclusive = true // 将 WelcomeScreen 从栈中移除

diff --git a/app/src/main/java/top/maary/oblivionis/ui/WelcomeScreen.kt b/app/src/main/java/top/maary/oblivionis/ui/WelcomeScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -24,6 +25,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 
@@ -48,6 +51,8 @@ fun WelcomeScreen(onPermissionFinished: () -> Unit) {
         if (!permissionHandled) {
             if (storagePermissionState.allPermissionsGranted and manageMediaPermissionState.value) {
                 permissionHandled = true
+                Log.v("OBLIVIONIS", "PERMISSION GRANT")
+
                 onPermissionFinished()
             } else {
                 Column (modifier = Modifier.fillMaxSize().padding(innerPadding),
@@ -69,27 +74,24 @@ fun WelcomeScreen(onPermissionFinished: () -> Unit) {
                 }
             }
         }
-        Log.v("YDNM", "1")
     }
-
-
-
 }
 
 @Composable
 fun rememberCanManageMediaState(): State<Boolean> {
     val context = LocalContext.current
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val state by lifecycleOwner.lifecycle.currentStateFlow.collectAsState()
     var canManageMedia by remember { mutableStateOf(false) }
 
-    LaunchedEffect(context) {
+    LaunchedEffect(state) {
         canManageMedia = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             // 检查应用是否可以管理媒体
             MediaStore.canManageMedia(context)
         } else {
             true // 如果版本低于 Android 12，默认返回 true
         }
     }
-    Log.v("YDNM", "2")
 
     return rememberUpdatedState(newValue = canManageMedia)
 }

diff --git a/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt b/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt
@@ -113,7 +113,7 @@ class ActionViewModel(
     private val _albums = MutableStateFlow<List<Album>>(emptyList())
     val albums: StateFlow<List<Album>> get() = _albums
 
-    private fun loadAlbums() {
+    fun loadAlbums() {
         viewModelScope.launch(Dispatchers.IO) {
             val albumList = getAlbumsFromMediaStore(getApplication<Application>().contentResolver)
             _albums.value = albumList
@@ -404,6 +404,7 @@ class ActionViewModel(
 
     init {
         loadAlbums()
+        /* TODO 获取权限 */
     }
 
     fun databaseMark(image: MediaStoreImage) = viewModelScope.launch {