Skip to content

Commit 38bf6a6

Browse files
committed
Increment to version 4.1.1
1 parent bbaeb99 commit 38bf6a6

File tree

6 files changed

+26
-11
lines changed

6 files changed

+26
-11
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6+
## [4.1.1] - 2024-12-18
7+
8+
### Added
9+
- Jade genuine check
10+
11+
### Changed
12+
- Bump GDK to version 0.74.0
13+
- Bump Breez to version 0.6.6
14+
- Update dependencies
15+
- Support video content on promo screen
16+
17+
### Fixed
18+
- Fix Jade BIP39 Passphrase input timeout
19+
- Fix recovery keyboard matching words pre-emptively
20+
- Various bug fixes
21+
622
## [4.1.0] - 2024-11-19
723

824
### Changed

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,8 +1962,8 @@ class GdkSession constructor(
19621962
}
19631963

19641964
suspend fun getFeeEstimates(network: Network): FeeEstimation = tryCatch(context = Dispatchers.Default) {
1965-
if(network.isLightning){
1966-
lightningSdk.recommendedFees().let { fees ->
1965+
if (network.isLightning) {
1966+
lightningSdk.recommendedFees()?.let { fees ->
19671967
(
19681968
listOf(fees.minimumFee) +
19691969
List(FeeBlockTarget[0] - 0) { fees.fastestFee } +
@@ -1973,8 +1973,7 @@ class GdkSession constructor(
19731973
FeeEstimation(it)
19741974
}
19751975
}
1976-
1977-
}else{
1976+
} else {
19781977
gdk.getFeeEstimates(gdkSession(network)).let {
19791978
// Temp fix
19801979
if (network.isSinglesig && network.isLiquid) {

common/src/commonMain/kotlin/com/blockstream/common/lightning/LightningBridge.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import breez_sdk.defaultConfig
5959
import breez_sdk.mnemonicToSeed
6060
import breez_sdk.parseInput
6161
import com.blockstream.common.data.AppInfo
62+
import com.blockstream.common.extensions.tryCatch
6263
import com.blockstream.common.fcm.FcmCommon
6364
import com.blockstream.common.platformFileSystem
6465
import com.blockstream.common.platformName
@@ -71,7 +72,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
7172
import kotlinx.coroutines.flow.MutableStateFlow
7273
import kotlinx.coroutines.flow.asSharedFlow
7374
import kotlinx.coroutines.flow.asStateFlow
74-
import kotlinx.coroutines.withContext
7575
import kotlinx.coroutines.withTimeout
7676
import kotlinx.datetime.Clock
7777
import okio.Path.Companion.toPath
@@ -456,8 +456,8 @@ class LightningBridge constructor(
456456
}
457457

458458
@NativeCoroutinesIgnore
459-
suspend fun recommendedFees(): RecommendedFees = withContext(context = Dispatchers.IO) {
460-
breezSdk.recommendedFees()
459+
suspend fun recommendedFees(): RecommendedFees? = tryCatch(context = Dispatchers.IO) {
460+
breezSdkOrNull?.recommendedFees()
461461
}
462462

463463
fun onchainPaymentLimits(): OnchainPaymentLimitsResponse {

common/src/commonMain/kotlin/com/blockstream/common/models/lightning/RecoverFundsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class RecoverFundsViewModel(
144144
session.ifConnectedSuspend {
145145
emit(
146146
session.lightningSdk.recommendedFees().also {
147-
_customFeeRate.value = it.minimumFee.toLong()
147+
_customFeeRate.value = it?.minimumFee?.toLong()
148148
}
149149
)
150150
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

green/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ android {
4040
defaultConfig {
4141
minSdk = libs.versions.androidMinSdk.get().toInt()
4242
targetSdk = libs.versions.androidTargetSdk.get().toInt()
43-
versionCode = 439
44-
versionName = "4.1.0"
43+
versionCode = 440
44+
versionName = "4.1.1"
4545

4646
setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
4747
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

0 commit comments

Comments
 (0)