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

Support directly selecting signalbackup.

Browse Source
This commit is contained in:
Alex Hart
2026-03-26 12:25:37 -03:00
committed by GitHub
parent ff04e5c5c3
commit d5329d0794
3 changed files with 146 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.backup.v2.local
import android.content.Context
import android.net.Uri
import androidx.annotation.VisibleForTesting
import androidx.documentfile.provider.DocumentFile
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
@@ -77,15 +78,28 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
fun openForRestore(context: Context, uri: Uri): ArchiveFileSystem? {
val root = DocumentFile.fromTreeUri(context, uri) ?: return null
if (!root.canRead()) return null
if (root.findFile(MAIN_DIRECTORY_NAME) == null) return null
return openForRestore(context, root)
}
@VisibleForTesting
fun openForRestore(context: Context, root: DocumentFile): ArchiveFileSystem? {
if (root.findFile(MAIN_DIRECTORY_NAME) == null && !looksLikeSignalBackupsDirectory(root)) return null
return try {
ArchiveFileSystem(context, root, readOnly = true)
} catch (e: IOException) {
Log.w(TAG, "Unable to open backup directory for restore: $uri", e)
Log.w(TAG, "Unable to open backup directory for restore", e)
null
}
}
/**
* Returns true if [dir] appears to be a SignalBackups directory based on its name and
* expected internal structure (presence of the "files" subdirectory).
*/
private fun looksLikeSignalBackupsDirectory(dir: DocumentFile): Boolean {
return dir.name == MAIN_DIRECTORY_NAME && dir.findFile("files") != null
}
/**
* Attempt to create an [ArchiveFileSystem] from a regular [File].
*
@@ -105,12 +119,28 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
/** File access to shared super-set of archive related files (e.g., media + attachments) */
val filesFileSystem: FilesFileSystem
/**
* True if this file system was opened directly from the SignalBackups directory itself (rather than its parent).
* In this case, the URI cannot be reused as a backup destination since we lack access to the parent directory.
*/
val isRootedAtSignalBackups: Boolean
init {
if (readOnly) {
signalBackups = root.findFile(MAIN_DIRECTORY_NAME) ?: throw IOException("SignalBackups directory not found in $root")
val child = root.findFile(MAIN_DIRECTORY_NAME)
if (child != null) {
signalBackups = child
isRootedAtSignalBackups = false
} else if (looksLikeSignalBackupsDirectory(root)) {
signalBackups = root
isRootedAtSignalBackups = true
} else {
throw IOException("SignalBackups directory not found in $root")
}
val filesDirectory = signalBackups.findFile("files") ?: throw IOException("files directory not found in $signalBackups")
filesFileSystem = FilesFileSystem(context, filesDirectory, readOnly = true)
} else {
isRootedAtSignalBackups = false
signalBackups = root.mkdirp(MAIN_DIRECTORY_NAME) ?: throw IOException("Unable to create main backups directory")
val filesDirectory = signalBackups.mkdirp("files") ?: throw IOException("Unable to create files directory")
filesFileSystem = FilesFileSystem(context, filesDirectory)

6
app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
View File

@@ -147,11 +147,13 @@ class RestoreLocalBackupActivityViewModel : ViewModel() {
StorageServiceRestore.restore()
RegistrationUtil.maybeMarkRegistrationComplete()
val canReenableBackups = backupIdMatchesCurrentAccount && !archiveFileSystem.isRootedAtSignalBackups
internalState.update {
it.copy(
restorePhase = RestorePhase.COMPLETE,
backupDirectory = if (backupIdMatchesCurrentAccount) backupDirectory else null,
dialog = if (backupIdMatchesCurrentAccount) RestoreLocalBackupActivityDialog.CONFIRM_BACKUP_LOCATION
backupDirectory = if (canReenableBackups) backupDirectory else null,
dialog = if (canReenableBackups) RestoreLocalBackupActivityDialog.CONFIRM_BACKUP_LOCATION
else RestoreLocalBackupActivityDialog.LOCAL_BACKUPS_DISABLED
)
}