Increment to version 4.1.1

Blockstream · Dec 20, 2024 · 38bf6a6 · 38bf6a6
1 parent bbaeb99
commit 38bf6a6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [4.1.1] - 2024-12-18
+
+### Added
+- Jade genuine check
+
+### Changed
+- Bump GDK to version 0.74.0
+- Bump Breez to version 0.6.6
+- Update dependencies
+- Support video content on promo screen 
+
+### Fixed
+- Fix Jade BIP39 Passphrase input timeout
+- Fix recovery keyboard matching words pre-emptively
+- Various bug fixes
+
 ## [4.1.0] - 2024-11-19
 
 ### Changed

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt b/common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt
@@ -1962,8 +1962,8 @@ class GdkSession constructor(
     }
 
     suspend fun getFeeEstimates(network: Network): FeeEstimation = tryCatch(context = Dispatchers.Default) {
-        if(network.isLightning){
-            lightningSdk.recommendedFees().let { fees ->
+        if (network.isLightning) {
+            lightningSdk.recommendedFees()?.let { fees ->
                 (
                         listOf(fees.minimumFee) +
                         List(FeeBlockTarget[0] - 0) { fees.fastestFee } +
@@ -1973,8 +1973,7 @@ class GdkSession constructor(
                     FeeEstimation(it)
                 }
             }
-
-        }else{
+        } else {
             gdk.getFeeEstimates(gdkSession(network)).let {
                 // Temp fix
                 if (network.isSinglesig && network.isLiquid) {

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/lightning/LightningBridge.kt b/common/src/commonMain/kotlin/com/blockstream/common/lightning/LightningBridge.kt
@@ -59,6 +59,7 @@ import breez_sdk.defaultConfig
 import breez_sdk.mnemonicToSeed
 import breez_sdk.parseInput
 import com.blockstream.common.data.AppInfo
+import com.blockstream.common.extensions.tryCatch
 import com.blockstream.common.fcm.FcmCommon
 import com.blockstream.common.platformFileSystem
 import com.blockstream.common.platformName
@@ -71,7 +72,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import kotlinx.datetime.Clock
 import okio.Path.Companion.toPath
@@ -456,8 +456,8 @@ class LightningBridge constructor(
     }
 
     @NativeCoroutinesIgnore
-    suspend fun recommendedFees(): RecommendedFees = withContext(context = Dispatchers.IO) {
-        breezSdk.recommendedFees()
+    suspend fun recommendedFees(): RecommendedFees? = tryCatch(context = Dispatchers.IO) {
+        breezSdkOrNull?.recommendedFees()
     }
 
     fun onchainPaymentLimits(): OnchainPaymentLimitsResponse {

diff --git a/...on/src/commonMain/kotlin/com/blockstream/common/models/lightning/RecoverFundsViewModel.kt b/...on/src/commonMain/kotlin/com/blockstream/common/models/lightning/RecoverFundsViewModel.kt
@@ -144,7 +144,7 @@ class RecoverFundsViewModel(
         session.ifConnectedSuspend {
             emit(
                 session.lightningSdk.recommendedFees().also {
-                    _customFeeRate.value = it.minimumFee.toLong()
+                    _customFeeRate.value = it?.minimumFee?.toLong()
                 }
             )
         }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/green/build.gradle.kts b/green/build.gradle.kts
@@ -40,8 +40,8 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
-        versionCode = 439
-        versionName = "4.1.0"
+        versionCode = 440
+        versionName = "4.1.1"
 
         setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")