Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-06 05:14:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Take a persistent URI permission for local backups in regV5.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-14 15:43:49 -04:00
parent 88366cd416
commit 2dde0b43b8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreLocalAttachmentJob.kt
+4
View File
@@ -186,6 +186,10 @@ class RestoreLocalAttachmentJob private constructor(
} catch (e: IOException) {
Log.w(TAG, "Experienced an exception while trying to read attachment.", e)
return Result.retry(defaultBackoff())
} catch (e: SecurityException) {
Log.w(TAG, "Lost access to the backup directory. Unable to restore attachment.", e)
SignalStore.backup.localRestoreDirectoryError = true
return Result.failure()
}
return Result.success()
app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
+9 -2
View File
@@ -402,8 +402,6 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
// Skip it if the folder is the SignalBackups directory itself, since it can't be reused as a destination.
val archiveFileSystem = ArchiveFileSystem.openForRestore(context, rootUri)
if (archiveFileSystem != null && !archiveFileSystem.isRootedAtSignalBackups) {
val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
context.contentResolver.takePersistableUriPermission(rootUri, takeFlags)
SignalStore.backup.newLocalBackupsDirectory = rootUri.toString()
SignalStore.backup.newLocalBackupsEnabled = true
LocalBackupListener.setNextBackupTimeToIntervalFromNow(context)
@@ -436,6 +434,15 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
}
override suspend fun scanLocalBackupFolder(folderUri: Uri): List<LocalBackupInfo> = withContext(Dispatchers.IO) {
// Persist access immediately, while the picker's transient grant is still alive. Restore jobs read from this
// folder long after the registration activity (and its grant) are gone.
try {
val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
context.contentResolver.takePersistableUriPermission(folderUri, takeFlags)
} catch (e: SecurityException) {
Log.w(TAG, "Unable to take persistable permission for backup folder", e)
}
val folder = DocumentFile.fromTreeUri(context, folderUri) ?: return@withContext emptyList()
val children = folder.listFiles()