Merge pull request #461 from synonymdev/feat/backup-polish

feat: polish backup & restore

Author: ovitrif

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
@@ -34,6 +36,8 @@ val keystoreProperties by lazy {
     keystoreProperties
 }
 
+val locales = listOf("en", "ar", "ca", "cs", "de", "el", "es", "fr", "it", "nl", "pl", "pt", "ru")
+
 android {
     namespace = "to.bitkit"
     compileSdk = 35
@@ -49,6 +53,7 @@ android {
         }
         buildConfigField("boolean", "E2E", System.getenv("E2E")?.toBoolean()?.toString() ?: "false")
         buildConfigField("boolean", "GEO", System.getenv("GEO")?.toBoolean()?.toString() ?: "true")
+        buildConfigField("String", "LOCALES", "\"${locales.joinToString(",")}\"")
     }
 
     flavorDimensions += "network"
@@ -131,7 +136,7 @@ android {
     }
     androidResources {
         @Suppress("UnstableApiUsage")
-        localeFilters.addAll(listOf("en", "ar", "ca", "cs", "de", "el", "es", "fr", "it", "nl", "pl", "pt", "ru"))
+        localeFilters.addAll(locales)
         @Suppress("UnstableApiUsage")
         generateLocaleConfig = true
     }
@@ -153,7 +158,7 @@ android {
     applicationVariants.all {
         val variant = this
         outputs
-            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+            .map { it as BaseVariantOutputImpl }
             .forEach { output ->
                 val apkName = "bitkit-android-${defaultConfig.versionCode}-${variant.name}.apk"
                 output.outputFileName = apkName
@@ -169,17 +174,6 @@ composeCompiler {
     reportsDestination = layout.buildDirectory.dir("compose_compiler")
 }
 
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-    ignoreFailures = true
-    reports {
-        html.required.set(true)
-        sarif.required.set(true)
-        md.required.set(false)
-        txt.required.set(false)
-        xml.required.set(false)
-    }
-}
-
 dependencies {
     implementation(fileTree("libs") { include("*.aar") })
     implementation(libs.jna) { artifact { type = "aar" } }
@@ -281,6 +275,19 @@ room {
     schemaDirectory("$projectDir/schemas")
 }
 
+// region Tasks
+
+tasks.withType<Detekt>().configureEach {
+    ignoreFailures = true
+    reports {
+        html.required.set(true)
+        sarif.required.set(true)
+        md.required.set(false)
+        txt.required.set(false)
+        xml.required.set(false)
+    }
+}
+
 tasks.withType<Test> {
     testLogging {
         events(
@@ -297,3 +304,12 @@ tasks.withType<Test> {
         showStackTraces = true
     }
 }
+
+// JDK 21+ prints warnings when ByteBuddy loads a dynamic Java agent during tests.
+// Our test stack triggers this automatically.
+// Explicitly enabling dynamic agent loading silences the warning without altering behavior.
+tasks.withType<Test>().configureEach {
+    jvmArgs("-XX:+EnableDynamicAgentLoading")
+}
+
+// endregion

app/detekt-baseline.xml

@@ -11,6 +11,7 @@ import to.bitkit.env.Env
 import to.bitkit.models.BitcoinDisplayUnit
 import to.bitkit.models.CoinSelectionPreference
 import to.bitkit.models.PrimaryDisplay
+import to.bitkit.models.SettingsBackupV1
 import to.bitkit.models.Suggestion
 import to.bitkit.models.TransactionSpeed
 import to.bitkit.utils.Logger
@@ -30,6 +31,14 @@ class SettingsStore @Inject constructor(
 
     val data: Flow<SettingsData> = store.data
 
+    suspend fun restoreFromBackup(payload: SettingsBackupV1) =
+        runCatching {
+            val data = payload.settings.resetPin()
+            store.updateData { data }
+        }.onSuccess {
+            Logger.debug("Restored settings", TAG)
+        }
+
     suspend fun update(transform: (SettingsData) -> SettingsData) {
         store.updateData(transform)
     }
@@ -61,6 +70,7 @@ class SettingsStore @Inject constructor(
     }
 
     companion object {
+        private const val TAG = "SettingsStore"
         private const val MAX_LAST_USED_TAGS = 10
     }
 }

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -15,6 +15,7 @@ import to.bitkit.data.dto.price.PriceDTO
 import to.bitkit.data.serializers.WidgetsSerializer
 import to.bitkit.models.WidgetType
 import to.bitkit.models.WidgetWithPosition
+import to.bitkit.models.WidgetsBackupV1
 import to.bitkit.models.widget.BlocksPreferences
 import to.bitkit.models.widget.CalculatorValues
 import to.bitkit.models.widget.FactsPreferences
@@ -43,9 +44,13 @@ class WidgetsStore @Inject constructor(
     val weatherFlow: Flow<WeatherDTO?> = data.map { it.weather }
     val priceFlow: Flow<PriceDTO?> = data.map { it.price }
 
-    suspend fun update(transform: (WidgetsData) -> WidgetsData) {
-        store.updateData(transform)
-    }
+    suspend fun restoreFromBackup(payload: WidgetsBackupV1) =
+        runCatching {
+            val data = payload.widgets
+            store.updateData { data }
+        }.onSuccess {
+            Logger.debug("Restored widgets", TAG)
+        }
 
     suspend fun updateCalculatorValues(calculatorValues: CalculatorValues) {
         store.updateData {
@@ -127,16 +132,16 @@ class WidgetsStore @Inject constructor(
     suspend fun addWidget(type: WidgetType) {
         if (store.data.first().widgets.map { it.type }.contains(type)) return
 
-        store.updateData {
-            it.copy(widgets = (it.widgets + WidgetWithPosition(type = type)).sortedBy { it.position })
+        store.updateData { data ->
+            data.copy(widgets = (data.widgets + WidgetWithPosition(type = type)).sortedBy { it.position })
         }
     }
 
     suspend fun deleteWidget(type: WidgetType) {
         if (!store.data.first().widgets.map { it.type }.contains(type)) return
 
-        store.updateData {
-            it.copy(widgets = it.widgets.filterNot { it.type == type })
+        store.updateData { data ->
+            data.copy(widgets = data.widgets.filterNot { it.type == type })
         }
     }
 
@@ -145,6 +150,10 @@ class WidgetsStore @Inject constructor(
             it.copy(widgets = widgets)
         }
     }
+
+    companion object {
+        private const val TAG = "WidgetsStore"
+    }
 }
 
 @Serializable

app/src/main/java/to/bitkit/data/WidgetsStore.kt

@@ -18,6 +18,7 @@ internal object Env {
     const val isE2eTest = BuildConfig.E2E
     const val isGeoblockingEnabled = BuildConfig.GEO
     val network = Network.valueOf(BuildConfig.NETWORK)
+    val locales = BuildConfig.LOCALES.split(",")
     val walletSyncIntervalSecs = 10_uL // TODO review
     val platform = "Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT})"
     const val version = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
@@ -116,10 +117,10 @@ internal object Env {
         Logger.info("App storage path: $path")
     }
 
-    val logDir: String
+    val logDir: File
         get() {
             require(::appStoragePath.isInitialized)
-            return File(appStoragePath).resolve("logs").ensureDir().path
+            return File(appStoragePath).resolve("logs").ensureDir()
         }
 
     fun ldkStoragePath(walletIndex: Int) = storagePathOf(walletIndex, network.name.lowercase(), "ldk")

app/src/main/java/to/bitkit/env/Env.kt

@@ -9,6 +9,11 @@ fun Activity.rawId(): String = when (this) {
     is Activity.Onchain -> v1.id
 }
 
+fun Activity.txType(): PaymentType = when (this) {
+    is Activity.Lightning -> v1.txType
+    is Activity.Onchain -> v1.txType
+}
+
 /**
  * Calculates the total value of an activity based on its type.
  *