mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Implement clearing full backup data from storage

Browse source
This commit is contained in:
Torsten Grote 2019-08-01 11:44:58 +02:00
parent 1ee443a3d8
commit a6e971609c
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackup.kt
View file

@ -152,7 +152,7 @@ class FullBackup(
} }
fun clearBackupData(packageInfo: PackageInfo) { fun clearBackupData(packageInfo: PackageInfo) {
// TODO plugin.removeDataOfPackage(packageInfo)
} }
fun cancelFullBackup() { fun cancelFullBackup() {
@ -160,7 +160,7 @@ class FullBackup(
val state = this.state ?: throw AssertionError("No state when canceling") val state = this.state ?: throw AssertionError("No state when canceling")
clearState() clearState()
try { try {
plugin.cancelFullBackup(state.packageInfo) plugin.removeDataOfPackage(state.packageInfo)
} catch (e: IOException) { } catch (e: IOException) {
Log.w(TAG, "Error cancelling full backup for ${state.packageName}", e) Log.w(TAG, "Error cancelling full backup for ${state.packageName}", e)
} }

5
app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackupPlugin.kt
View file

@ -12,7 +12,10 @@ interface FullBackupPlugin {
@Throws(IOException::class) @Throws(IOException::class)
fun getOutputStream(targetPackage: PackageInfo): OutputStream fun getOutputStream(targetPackage: PackageInfo): OutputStream
/**
* Remove all data associated with the given package.
*/
@Throws(IOException::class) @Throws(IOException::class)
fun cancelFullBackup(targetPackage: PackageInfo) fun removeDataOfPackage(packageInfo: PackageInfo)
} }

6
app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderFullBackup.kt
View file

@ -23,9 +23,9 @@ class DocumentsProviderFullBackup(
} }
@Throws(IOException::class) @Throws(IOException::class)
override fun cancelFullBackup(targetPackage: PackageInfo) { override fun removeDataOfPackage(packageInfo: PackageInfo) {
val packageName = targetPackage.packageName val packageName = packageInfo.packageName
Log.i(TAG, "Deleting $packageName due to canceled backup...") Log.i(TAG, "Deleting $packageName...")
val file = storage.defaultFullBackupDir?.findFile(packageName) ?: return val file = storage.defaultFullBackupDir?.findFile(packageName) ?: return
if (!file.delete()) throw IOException("Failed to delete $packageName") if (!file.delete()) throw IOException("Failed to delete $packageName")
} }

11
app/src/test/java/com/stevesoltys/backup/transport/backup/FullBackupTest.kt
View file

@ -174,11 +174,18 @@ internal class FullBackupTest : BackupTest() {
assertFalse(backup.hasState()) assertFalse(backup.hasState())
} }
@Test
fun `clearBackupData delegates to plugin`() {
every { plugin.removeDataOfPackage(packageInfo) } just Runs
backup.clearBackupData(packageInfo)
}
@Test @Test
fun `cancel full backup runs ok`() { fun `cancel full backup runs ok`() {
expectPerformFullBackup() expectPerformFullBackup()
expectClearState() expectClearState()
every { plugin.cancelFullBackup(packageInfo) } just Runs every { plugin.removeDataOfPackage(packageInfo) } just Runs
assertEquals(TRANSPORT_OK, backup.performFullBackup(packageInfo, data)) assertEquals(TRANSPORT_OK, backup.performFullBackup(packageInfo, data))
assertTrue(backup.hasState()) assertTrue(backup.hasState())
@ -190,7 +197,7 @@ internal class FullBackupTest : BackupTest() {
fun `cancel full backup ignores exception when calling plugin`() { fun `cancel full backup ignores exception when calling plugin`() {
expectPerformFullBackup() expectPerformFullBackup()
expectClearState() expectClearState()
every { plugin.cancelFullBackup(packageInfo) } throws IOException() every { plugin.removeDataOfPackage(packageInfo) } throws IOException()
assertEquals(TRANSPORT_OK, backup.performFullBackup(packageInfo, data)) assertEquals(TRANSPORT_OK, backup.performFullBackup(packageInfo, data))
assertTrue(backup.hasState()) assertTrue(backup.hasState())