From f8b2c79aef51dd61ef7873053e208fc408e0019d Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 28 Oct 2021 22:33:12 -0400 Subject: [PATCH 1/2] Update dependencies --- app/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ee8296dd4..b7a40fcca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -141,19 +141,19 @@ dependencies { implementation("org.tachiyomi:source-api:1.1") // AndroidX libraries - implementation("androidx.annotation:annotation:1.3.0-beta01") - implementation("androidx.appcompat:appcompat:1.4.0-beta01") + implementation("androidx.annotation:annotation:1.3.0-rc01") + implementation("androidx.appcompat:appcompat:1.4.0-rc01") implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03") implementation("androidx.browser:browser:1.4.0-rc01") implementation("androidx.constraintlayout:constraintlayout:2.1.1") implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") - implementation("androidx.core:core-ktx:1.7.0-rc01") + implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.core:core-splashscreen:1.0.0-alpha02") implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("androidx.viewpager:viewpager:1.1.0-alpha01") - val lifecycleVersion = "2.4.0-beta01" + val lifecycleVersion = "2.4.0" implementation("androidx.lifecycle:lifecycle-common:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") @@ -229,7 +229,7 @@ dependencies { implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1") // UI libraries - implementation("com.google.android.material:material:1.5.0-alpha04") + implementation("com.google.android.material:material:1.5.0-alpha05") implementation("com.github.dmytrodanylyk.android-process-button:library:1.0.4") implementation("com.github.arkon.FlexibleAdapter:flexible-adapter:c8013533") implementation("com.github.arkon.FlexibleAdapter:flexible-adapter-ui:c8013533") From 4f560717869f5ac9fe0b1626cedf3ce5affce74b Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 28 Oct 2021 22:33:50 -0400 Subject: [PATCH 2/2] Validate backup during creation --- .../kanade/tachiyomi/data/backup/full/FullBackupManager.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt index 03984b12d..c334bcd21 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt @@ -85,7 +85,12 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { val byteArray = parser.encodeToByteArray(BackupSerializer, backup!!) file.openOutputStream().sink().gzip().buffer().use { it.write(byteArray) } - return file.uri.toString() + val fileUri = file.uri + + // Validate it to make sure it works + FullBackupRestoreValidator().validate(context, fileUri) + + return fileUri.toString() } catch (e: Exception) { logcat(LogPriority.ERROR, e) throw e