Don't use reflection for handling backup options as boolean array

Wasn't working correctly in release build, _probably_ because of R8 despite kotlin-reflect shipping with Proguard rules and us already keeping all Tachiyomi classes. (cherry picked from commit 6ab8e1e)
jobobby04 · Dec 31, 2023 · f27b8b2 · f27b8b2
1 parent 0432f41
commit f27b8b2
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 97 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/RestoreBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/RestoreBackupScreen.kt
@@ -32,7 +32,6 @@ import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
 import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import kotlinx.coroutines.flow.update
-import tachiyomi.core.util.lang.anyEnabled
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.LazyColumnWithAction

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreateJob.kt
@@ -24,8 +24,6 @@ import eu.kanade.tachiyomi.util.system.isRunning
 import eu.kanade.tachiyomi.util.system.setForegroundSafely
 import eu.kanade.tachiyomi.util.system.workManager
 import logcat.LogPriority
-import tachiyomi.core.util.lang.asBooleanArray
-import tachiyomi.core.util.lang.asDataClass
 import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.backup.service.BackupPreferences
 import tachiyomi.domain.storage.service.StorageManager
@@ -49,7 +47,7 @@ class BackupCreateJob(private val context: Context, workerParams: WorkerParamete
 
         setForegroundSafely()
 
-        val options: BackupOptions = inputData.getBooleanArray(OPTIONS_KEY)?.asDataClass()
+        val options = inputData.getBooleanArray(OPTIONS_KEY)?.let { BackupOptions.fromBooleanArray(it) }
             ?: BackupOptions()
 
         return try {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
@@ -20,6 +20,21 @@ data class BackupOptions(
     // SY <--
 ) {
 
+    fun asBooleanArray() = booleanArrayOf(
+        libraryEntries,
+        categories,
+        chapters,
+        tracking,
+        history,
+        appSettings,
+        sourceSettings,
+        privateSettings,
+        // SY -->
+        customInfo,
+        readEntries,
+        // SY <--
+    )
+
     companion object {
         val libraryOptions = persistentListOf(
             Entry(
@@ -85,6 +100,21 @@ data class BackupOptions(
                 enabled = { it.appSettings || it.sourceSettings },
             ),
         )
+
+        fun fromBooleanArray(array: BooleanArray) = BackupOptions(
+            libraryEntries = array[0],
+            categories = array[1],
+            chapters = array[2],
+            tracking = array[3],
+            history = array[4],
+            appSettings = array[5],
+            sourceSettings = array[6],
+            privateSettings = array[7],
+            // SY -->
+            customInfo = array[8],
+            readEntries = array[9],
+            // SY <--
+        )
     }
 
     data class Entry(

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestoreJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestoreJob.kt
@@ -20,8 +20,6 @@ import eu.kanade.tachiyomi.util.system.workManager
 import kotlinx.coroutines.CancellationException
 import logcat.LogPriority
 import tachiyomi.core.i18n.stringResource
-import tachiyomi.core.util.lang.asBooleanArray
-import tachiyomi.core.util.lang.asDataClass
 import tachiyomi.core.util.system.logcat
 import tachiyomi.i18n.MR
 
@@ -32,7 +30,7 @@ class BackupRestoreJob(private val context: Context, workerParams: WorkerParamet
 
     override suspend fun doWork(): Result {
         val uri = inputData.getString(LOCATION_URI_KEY)?.toUri()
-        val options: RestoreOptions? = inputData.getBooleanArray(OPTIONS_KEY)?.asDataClass()
+        val options = inputData.getBooleanArray(OPTIONS_KEY)?.let { RestoreOptions.fromBooleanArray(it) }
 
         if (uri == null || options == null) {
             return Result.failure()

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt
@@ -14,6 +14,17 @@ data class RestoreOptions(
     // SY <--
 ) {
 
+    fun asBooleanArray() = booleanArrayOf(
+        library,
+        appSettings,
+        sourceSettings,
+        // SY -->
+        savedSearches
+        // SY <--
+    )
+
+    fun anyEnabled() = library || appSettings || sourceSettings /* SY --> */ || savedSearches /* SY <-- */
+
     companion object {
         val options = persistentListOf(
             Entry(
@@ -39,6 +50,15 @@ data class RestoreOptions(
             ),
             // SY <--
         )
+
+        fun fromBooleanArray(array: BooleanArray) = RestoreOptions(
+            library = array[0],
+            appSettings = array[1],
+            sourceSettings = array[2],
+            // SY -->
+            savedSearches = array[3]
+            // SY <--
+        )
     }
 
     data class Entry(

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -37,7 +37,6 @@ dependencies {
 
     implementation(libs.unifile)
 
-    implementation(kotlinx.reflect)
     api(kotlinx.coroutines.core)
     api(kotlinx.serialization.json)
     api(kotlinx.serialization.json.okio)

diff --git a/core/src/main/java/tachiyomi/core/util/lang/BooleanDataClassExtensions.kt b/core/src/main/java/tachiyomi/core/util/lang/BooleanDataClassExtensions.kt
diff --git a/core/src/test/kotlin/tachiyomi/core/util/lang/BooleanDataClassExtensionsTest.kt b/core/src/test/kotlin/tachiyomi/core/util/lang/BooleanDataClassExtensionsTest.kt