Skip to content

fix(backup): accept Operit package variants #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AAswordman merged 1 commit into from
Aug 13, 2026
+29 −3
Merged

fix(backup): accept Operit package variants #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app/src/main/java/com/ai/assistance/operit/data/backup/RawSnapshotBackupManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json

private const val SNAPSHOT_PACKAGE_NAME_PREFIX = "com.ai.assistance.operit"

internal fun isSupportedSnapshotPackageName(packageName: String): Boolean =
packageName.startsWith(SNAPSHOT_PACKAGE_NAME_PREFIX)

object RawSnapshotBackupManager {

private const val TAG = "RawSnapshotBackup"
Expand Down Expand Up @@ -288,7 +293,7 @@ object RawSnapshotBackupManager {
AppLogger.i(TAG, "restore closed databases (room + objectbox)")

withContext(Dispatchers.Main) { onProgress?.invoke(RestoreProgress.EXTRACTING) }
val manifest = extractZipToWorkDir(cacheZip, workDir, expectedPackageName = context.packageName)
val manifest = extractZipToWorkDir(cacheZip, workDir)

val payloadDir = File(workDir, "payload")
val externalFilesPayloadDir = File(payloadDir, "external_files")
Expand Down Expand Up @@ -343,7 +348,7 @@ object RawSnapshotBackupManager {
}
}

private fun extractZipToWorkDir(zipFile: File, workDir: File, expectedPackageName: String): Manifest {
private fun extractZipToWorkDir(zipFile: File, workDir: File): Manifest {
val payloadRoot = File(workDir, "payload")
payloadRoot.mkdirs()

Expand Down Expand Up @@ -407,7 +412,7 @@ object RawSnapshotBackupManager {
throw IllegalArgumentException("Unsupported backup version: ${manifest.formatVersion}")
}

if (manifest.packageName != expectedPackageName) {
if (!isSupportedSnapshotPackageName(manifest.packageName)) {
throw IllegalArgumentException("Backup package mismatch: ${manifest.packageName}")
}

Expand Down
21 changes: 21 additions & 0 deletions app/src/test/java/com/ai/assistance/operit/data/backup/RawSnapshotBackupManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.ai.assistance.operit.data.backup

import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test

class RawSnapshotBackupManagerTest {

@Test
fun snapshotPackageName_acceptsOperitPackagePrefix() {
assertTrue(isSupportedSnapshotPackageName("com.ai.assistance.operit"))
assertTrue(isSupportedSnapshotPackageName("com.ai.assistance.operit.debug"))
assertTrue(isSupportedSnapshotPackageName("com.ai.assistance.operit.clone"))
}

@Test
fun snapshotPackageName_rejectsDifferentPackagePrefix() {
assertFalse(isSupportedSnapshotPackageName("com.ai.assistance.other"))
assertFalse(isSupportedSnapshotPackageName("com.example.operit"))
}
}