release/v4.9.3

.github/workflows/notify.yml

@@ -1,9 +1,9 @@
-name: Notify Mirror on PR
+name: Notify 🪞 on PR
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
+  workflow_dispatch: 
+  #pull_request:
+  #  types: [opened, synchronize, reopened]
 jobs:
   trigger-mirror:
     runs-on: ubuntu-latest
@@ -17,11 +17,11 @@ jobs:
               owner: 'gruntsoftware',
               repo: 'android',
               workflow_id: 'sync.yml',
-              ref: 'main',
+              ref: 'develop',
               inputs: {
                 source: '${{ github.event.repository.name }}',
                 pr_number: '${{ github.event.pull_request.number }}',
                 pr_title: '${{ github.event.pull_request.title }}',
                 branch: '${{ github.head_ref }}'
               }
-            })
+            })

.github/workflows/pr-summary-copilot.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - develop
       - main
+  workflow_dispatch:
 
 permissions:
   contents: read

app/build.gradle.kts

@@ -35,8 +35,8 @@ android {
         applicationId = "ltd.grunt.brainwallet"
         minSdk = 29
         targetSdk = 35
-        versionCode = 202506326
-        versionName = "v4.9.1"
+        versionCode = 202506335
+        versionName = "v4.9.3"
         multiDexEnabled = true
         base.archivesName.set("${defaultConfig.versionName}(${defaultConfig.versionCode})")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -86,14 +86,14 @@ android {
                 isDebuggable = true
                 isMinifyEnabled = false
             }
+            resValue("string", "firebase_analytics_collection_enabled", "false")
         }
-
         val release by getting {
             signingConfig = signingConfigs.getByName("release")
             isDebuggable = false
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-
+            resValue("string", "firebase_analytics_collection_enabled", "true")
             ndk {
                 isDebuggable = false
                 isMinifyEnabled = true
@@ -200,6 +200,7 @@ dependencies {
     implementation(project(":iap"))
     implementation(project(":core"))
     implementation("androidx.webkit:webkit:1.9.0")
+    implementation(libs.androidx.benchmark.traceprocessor)
     testImplementation(testFixtures(project(":app")))
     androidTestImplementation(testFixtures(project(":app")))
     implementation(grunt.androidx.core.ktx)
@@ -257,6 +258,7 @@ dependencies {
     implementation(libs.android.installreferrer)
     implementation("androidx.compose.animation:animation:1.5.0")
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7")
+    implementation("io.coil-kt:coil-compose:2.0.0-rc01")
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
     testImplementation(libs.turbine)

app/src/main/java/com/brainwallet/constants/BWConstants.kt

@@ -24,8 +24,6 @@ object BWConstants {
      */
     const val NATIVE_LIB_NAME: String = "core-lib"
 
-    const val _BW_MAIN_OPEN: String = "bw_main_open"
-
     /**
      * Permissions
      */
@@ -106,8 +104,7 @@ object BWConstants {
     const val SUPPORT_WEB_LINK: String = "https://www.brainwallet.co/support"
     const val TOS_LINK: String = "https://www.brainwallet.co/privacypolicy"
     const val LINKTREE_URL: String = "https://linktr.ee/brainwallet"
-
-    const val BITREFILL_URL: String = "https://www.bitrefill.com/?ref=bAshL935"
+    const val BITREFILL_URL: String = "https://www.bitrefill.com/?ref=bw_tk_26"
 
     /**
      * API Hosts
@@ -128,7 +125,7 @@ object BWConstants {
     const val _20200112_ERR: String = "brainwallet_android_error"
     const val _20200112_DSR: String = "did_start_resync"
     const val _20201118_DTGS: String = "did_tap_get_support"
-    const val _20200217_DUWB: String = "did_unlock_with_biometrics"
+    const val _20200217_DU: String = "did_unlock"
 
     const val _20250303_DSTU: String = "did_skip_top_up"
     const val _20250517_WCINFO: String = "wallet_callback_info"

app/src/main/java/com/brainwallet/data/repository/LtcRepository.kt

@@ -5,11 +5,12 @@ import com.brainwallet.data.model.Fee
 import com.brainwallet.data.model.LtcStats
 import com.brainwallet.data.model.MoonpayCurrencyLimit
 import com.brainwallet.data.source.response.GetMoonpayBuyQuoteResponse
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 
 interface LtcRepository {
 
-    val rates: StateFlow<List<CurrencyEntity>>
+    val rates: SharedFlow<List<CurrencyEntity>>
     val ltcStats: StateFlow<LtcStats>
 
     suspend fun fetchRates(): List<CurrencyEntity>

app/src/main/java/com/brainwallet/data/repository/LtcRepositoryImpl.kt

@@ -10,28 +10,56 @@ import com.brainwallet.data.model.LtcStats
 import com.brainwallet.data.model.MoonpayCurrencyLimit
 import com.brainwallet.data.repository.LtcRepository.Companion.PREF_KEY_BUY_LIMITS_PREFIX
 import com.brainwallet.data.repository.LtcRepository.Companion.PREF_KEY_BUY_LIMITS_PREFIX_CACHED_AT
+import com.brainwallet.data.source.PeerManagerSource
 import com.brainwallet.data.source.RemoteApiSource
+import com.brainwallet.data.source.RemoteConfigSource
 import com.brainwallet.data.source.fetchWithCache
 import com.brainwallet.data.source.response.GetMoonpayBuyQuoteResponse
+import com.brainwallet.di.AppModule.json
 import com.brainwallet.tools.manager.BRSharedPrefs
 import com.brainwallet.tools.manager.FeeManager
 import com.brainwallet.tools.sqlite.CurrencyDataSource
 import com.brainwallet.tools.util.Utils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.koin.core.annotation.Single
+import timber.log.Timber
 
 @Single(binds = [LtcRepository::class])
 class LtcRepositoryImpl(
     private val context: Context,
     private val remoteApiSource: RemoteApiSource,
+    private val remoteConfigSource: RemoteConfigSource,
     private val currencyDataSource: CurrencyDataSource,
+    private val peerManagerSource: PeerManagerSource,
+    private val repositoryScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO),
     private val sharedPreferences: SharedPreferences,
 ) : LtcRepository {
 
-    private val _rates = MutableStateFlow<List<CurrencyEntity>>(emptyList())
-    override val rates: StateFlow<List<CurrencyEntity>> = _rates.asStateFlow()
+//    private val _rates = MutableStateFlow<List<CurrencyEntity>>(
+//        currencyDataSource.getAllCurrencies(true) // seed from cache immediately
+//    )
+    private val _rates = MutableSharedFlow<List<CurrencyEntity>>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    ).apply {
+        // seed with cached values immediately, same as before
+        tryEmit(currencyDataSource.getAllCurrencies(true))
+    }
+    override val rates: SharedFlow<List<CurrencyEntity>> = _rates.asSharedFlow()
     private val _ltcStats = MutableStateFlow(
         LtcStats(
             0,
@@ -40,12 +68,48 @@ class LtcRepositoryImpl(
             0
         )
     )
+
+    private var syncingDelay = 60_000L
+    private var nonSyncingDelay = 4_000L
+
+    @Serializable
+    private data class SyncPoolerContentWrapper(
+        @SerialName("sync_delay") val syncDelayValue: Long = 60_000L,
+        @SerialName("non_sync_delay") val nonSyncDelayValue: Long = 4_000L
+    )
+
     override val ltcStats: StateFlow<LtcStats> = _ltcStats.asStateFlow()
 
+    init {
+
+        repositoryScope.launch {
+            runCatching { remoteConfigSource.fetchAndActivate() }
+                .onFailure { Timber.e(it, "RemoteConfig fetch failed") }
+
+            val rawJson = remoteConfigSource.getString(RemoteConfigSource.KEY_SYNC_POLLER)
+            runCatching {
+                val config = json.decodeFromString<SyncPoolerContentWrapper>(rawJson)
+                syncingDelay = config.syncDelayValue
+                nonSyncingDelay = config.nonSyncDelayValue
+            }.onFailure { Timber.e(it, "RemoteConfig parse failed") }
+
+            while (isActive) {
+                runCatching { fetchRates() }
+                    .onFailure { Timber.e(it, "fetchRates failed") }
+
+                val delay = if (peerManagerSource.blockInfo.value.syncProgress <= 0.95f) {
+                    syncingDelay
+                } else {
+                    nonSyncingDelay
+                }
+                Timber.d("timber|| duration in fetching $syncingDelay $nonSyncingDelay")
+                delay(delay)
+            }
+        }
+    }
     override suspend fun fetchRates(): List<CurrencyEntity> {
         return runCatching {
             val rates = remoteApiSource.getRates()
-
             FeeManager.updateFeePerKb(context)
             val selectedISO = BRSharedPrefs.getIsoSymbol(context)
             rates.forEachIndexed { index, currencyEntity ->
@@ -62,7 +126,7 @@ class LtcRepositoryImpl(
         }.getOrElse {
             currencyDataSource.getAllCurrencies(true)
         }.also { result ->
-            _rates.value = result
+            _rates.emit(result)
         }
     }
 

app/src/main/java/com/brainwallet/data/repository/ShopProxyRepositoryImpl.kt

@@ -0,0 +1,50 @@
+package com.brainwallet.data.repository
+import com.brainwallet.data.source.RemoteConfigSource
+import com.brainwallet.presenter.entities.ShopCard
+import com.brainwallet.presenter.entities.ShopConfig
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import timber.log.Timber
+
+@Serializable
+data class ShopProxy(
+    @SerialName("widget_url") val widget: String = "",
+    @SerialName("cards") val shopCards: List<ShopCard> = emptyList()
+)
+
+interface ShopProxyRepository {
+    val shopProxy: StateFlow<List<ShopProxy>>
+    suspend fun refresh()
+}
+
+class ShopProxyRepositoryImpl(
+    private val remoteConfigSource: RemoteConfigSource,
+    private val json: Json,
+) : ShopProxyRepository {
+
+    private val _shopProxy = MutableStateFlow<List<ShopProxy>>(emptyList())
+    override val shopProxy: StateFlow<List<ShopProxy>> = _shopProxy.asStateFlow()
+
+    override suspend fun refresh() {
+        runCatching { remoteConfigSource.fetchAndActivate() }
+            .onFailure { Timber.e(it, "RemoteConfig fetch failed") }
+
+        val rawJson = remoteConfigSource.getString(RemoteConfigSource.PATH_SHOP_CONTENT)
+        Timber.d("ShopProxy rawJson: '$rawJson'")
+
+        runCatching {
+            val shopConfig = json.decodeFromString<ShopConfig>(rawJson)
+            Timber.d("ShopConfig parsed: ${shopConfig.shopData}")
+            _shopProxy.value = listOf(shopConfig.shopData).map {
+                ShopProxy(
+                    widget = it.widgetUrl,
+                    shopCards = it.cards
+                )
+            }
+        }.onFailure { Timber.e(it, "RemoteConfig parse failed") }
+    }
+}

app/src/main/java/com/brainwallet/data/repository/SyncAnalyticsRepository.kt

@@ -40,7 +40,7 @@ class SyncAnalyticsRepository(
         stopSync()
 
         val totalDuration = prefs.getLong(KEY_ACCUMULATED_DURATION, 0L)
-        if (totalDuration == 0L) return
+        if (totalDuration <= 8000L) return
 
         val endTimestamp = peerManagerSource.getLastBlockTimestamp()
         val endBlockHeight = peerManagerSource.getCurrentBlockHeight()

app/src/main/java/com/brainwallet/data/source/RemoteConfigSource.kt

@@ -8,6 +8,14 @@ interface RemoteConfigSource {
         const val KEY_FEATURE_MENU_HIDDEN_EXAMPLE = "feature_menu_hidden_example"
         const val KEY_FEATURE_SELECTED_PEERS_ENABLED = "feature_selected_peers_enabled"
         const val KEY_FEATURE_GAMEHUB_CONTENT = "feature_gamehub_content"
+        const val PATH_SHOP_CONTENT = "path_shop_content"
+        const val KEY_SYNC_POLLER = "key_sync_poller"
+        const val KEY_API_BASEURL_PROD_NEW_ENABLED = "key_api_baseurl_prod_new_enabled"
+        const val KEY_FEATURE_LTC_BROWSER_CONTENT = "feature_ltc_browser_content"
+        const val KEY_KEYSTORE_MANAGER_ENABLED = "key_keystore_manager_enabled"
+        const val KEY_DEV_API_BASEURL = "key_dev_api_baseurl"
+        const val KEY_API_BASEURL_DEV_NEW_ENABLED = "key_api_baseurl_dev_new_enabled"
+        const val KEY_PROD_API_BASEURL = "key_prod_api_baseurl"
     }
 
     fun initialize()

app/src/main/java/com/brainwallet/di/RemoteConfigModule.kt

@@ -3,6 +3,8 @@ package com.brainwallet.di
 import com.brainwallet.data.repository.FirebaseRemoteConfigRepositoryImpl
 import com.brainwallet.data.repository.HubContentRepository
 import com.brainwallet.data.repository.HubContentRepositoryImpl
+import com.brainwallet.data.repository.ShopProxyRepository
+import com.brainwallet.data.repository.ShopProxyRepositoryImpl
 import com.brainwallet.data.source.RemoteConfigSource
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import org.koin.dsl.module
@@ -11,10 +13,14 @@ val remoteConfigModule = module {
     single {
         FirebaseRemoteConfig.getInstance().apply {
             setDefaultsAsync(
-                mapOf(RemoteConfigSource.KEY_FEATURE_GAMEHUB_CONTENT to "[]")
+                mapOf(
+                    RemoteConfigSource.KEY_FEATURE_GAMEHUB_CONTENT to "[]",
+                    RemoteConfigSource.PATH_SHOP_CONTENT to "{\"shop_data\":{}}"
+                )
             )
         }
     }
     single<RemoteConfigSource> { FirebaseRemoteConfigRepositoryImpl(get()) }
     single<HubContentRepository> { HubContentRepositoryImpl(get(), get()) }
+    single<ShopProxyRepository> { ShopProxyRepositoryImpl(get(), get()) }
 }

app/src/main/java/com/brainwallet/navigation/MainNavigationHost.kt

@@ -148,10 +148,10 @@ fun NavGraphBuilder.mainNavGraph(
     }
 
     composable<Route.BitrefillWeb> { navBackStackEntry ->
-        val route: Route.LinktreeWeb = navBackStackEntry.toRoute()
+        val route: Route.BitrefillWeb = navBackStackEntry.toRoute()
         WebModalScreen(
             onNavigate = onNavigate,
-            url = BWConstants.BITREFILL_URL
+            url = route.url
         )
     }
 }

app/src/main/java/com/brainwallet/navigation/Route.kt

@@ -65,7 +65,7 @@ sealed class Route : JavaSerializable {
     object MoonPayBuy : Route()
 
     @Serializable
-    object BitrefillWeb : Route()
+    data class BitrefillWeb(val url: String) : Route()
 
     @Serializable
     object LinktreeWeb : Route()