Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-17 23:43:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Retry canWrite() check when opening backup directory for writing.

Browse Source 
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Alex Hart
2026-03-26 14:54:10 -03:00
committed by GitHub
parent 9702728c19
commit 25452fefa5
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt
View File

@@ -18,6 +18,8 @@ import org.signal.archive.local.ArchivedFilesReader
import org.signal.core.models.backup.MediaName import org.signal.core.models.backup.MediaName
import org.signal.core.util.Stopwatch import org.signal.core.util.Stopwatch
import org.signal.core.util.androidx.DocumentFileInfo import org.signal.core.util.androidx.DocumentFileInfo
import org.signal.core.util.androidx.DocumentFileUtil
import org.signal.core.util.androidx.DocumentFileUtil.OperationResult
import org.signal.core.util.androidx.DocumentFileUtil.delete import org.signal.core.util.androidx.DocumentFileUtil.delete
import org.signal.core.util.androidx.DocumentFileUtil.hasFile import org.signal.core.util.androidx.DocumentFileUtil.hasFile
import org.signal.core.util.androidx.DocumentFileUtil.inputStream import org.signal.core.util.androidx.DocumentFileUtil.inputStream
@@ -59,9 +61,18 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
* Should likely only be called on API29+ * Should likely only be called on API29+
*/ */
fun fromUri(context: Context, uri: Uri): ArchiveFileSystem? { fun fromUri(context: Context, uri: Uri): ArchiveFileSystem? {
val root = DocumentFile.fromTreeUri(context, uri) val root = DocumentFile.fromTreeUri(context, uri) ?: return null
if (root == null || !root.canWrite()) { val result = DocumentFileUtil.retryDocumentFileOperation<Unit> { attempt, maxAttempts ->
Log.d(TAG, "canWrite() check attempt ${attempt + 1}/$maxAttempts")
if (root.canWrite()) {
OperationResult.Success(true)
} else {
OperationResult.Retry
}
}
if (!result.isSuccess()) {
return null return null
} }