From 76b384ffb6aee4266c7f2287ba29381ad53adf94 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Fri, 29 Dec 2023 21:49:12 +0100
Subject: [PATCH] refactor: Small improvement for taking persistable uri
 permission

---
 .../SettingsScreen/Tiles/SaveFolderTile.kt          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/Tiles/SaveFolderTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/Tiles/SaveFolderTile.kt
index c62db5c..8ffa9d0 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/Tiles/SaveFolderTile.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/Tiles/SaveFolderTile.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.documentfile.provider.DocumentFile
 import app.myzel394.alibi.R
 import app.myzel394.alibi.dataStore
 import app.myzel394.alibi.db.AppSettings
@@ -58,6 +59,13 @@ fun SaveFolderTile(
             }
         }
 
+        if (path != null) {
+            context.contentResolver.takePersistableUriPermission(
+                Uri.parse(path),
+                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+            )
+        }
+
         scope.launch {
             dataStore.updateData {
                 it.setSaveFolder(path)
@@ -70,11 +78,6 @@ fun SaveFolderTile(
             return@rememberFolderSelectorDialog
         }
 
-        context.contentResolver.takePersistableUriPermission(
-            folder,
-            Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-        )
-
         updateValue(folder.toString())
     }