Increment to version 4.0.31

CHANGELOG.md

@@ -3,6 +3,20 @@ 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.0.31] - 2024-07-02
+
+### Added
+- Allow disabling TLS on Personal Electrum servers
+
+### Changed
+- Refactor ViewModels to support Kotlin Multiplatform
+- Refactor various UI elements
+- Updated project dependencies
+- Bump Breez to version 0.5.1-rc4
+
+- ### Fixed
+- Fix F-Droid dependency issue
+
 ## [4.0.30] - 2024-06-10
 
 ### Added

base/build.gradle.kts

@@ -10,15 +10,10 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(libs.versions.jvm.get().toInt())
 }
 
 dependencies {
@@ -41,12 +36,15 @@ dependencies {
     api(libs.androidx.browser)
     api(libs.androidx.recyclerview)
     api(libs.androidx.viewpager2)
-    api(libs.installreferrer)
     api(libs.androidx.startup.runtime)
     api(libs.compose.material3)
     api(libs.androidx.work.runtime.ktx)
     /** ----------------------------------------------------------------------------------------- */
 
+    /**  --- Countly ---------------------------------------------------------------------------- */
+    api(libs.countly.sdk.android)
+    /** ----------------------------------------------------------------------------------------- */
+
     /**  --- Logging ---------------------------------------------------------------------------- */
     api(libs.slf4j.simple)
     api(libs.kotlin.logging.jvm)

base/src/main/java/com/blockstream/base/InstallReferrer.kt

@@ -0,0 +1,10 @@
+package com.blockstream.base
+
+import ly.count.android.sdk.ModuleAttribution
+
+// No-Op Install Referrer for F-Droid
+open class InstallReferrer {
+    open fun handleReferrer(attribution: ModuleAttribution.Attribution, onComplete: (referrer: String) -> Unit) {
+        onComplete.invoke("")
+    }
+}

common/build.gradle.kts

@@ -1,5 +1,5 @@
-
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
 
 plugins {
@@ -32,16 +32,19 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
             freeCompilerArgs.addAll("-P", "plugin:org.jetbrains.kotlin.parcelize:additionalAnnotation=com.blockstream.common.Parcelize")
         }
-        compilations.configureEach {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_17.majorVersion
-            }
-        }
     }
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
+    jvmToolchain(libs.versions.jvm.get().toInt())
+
     jvm()
 
     val xcf = XCFramework()
@@ -80,7 +83,7 @@ kotlin {
                 commit = "1892410d13fceccd7cf91f803f06f110efc215b3"
             }
 
-            // Support for Objective-C headers with @import directives
+            // Support for Objective-C headers with @import directives
             // https://kotlinlang.org/docs/native-cocoapods-libraries.html#support-for-objective-c-headers-with-import-directives
             extraOpts += listOf("-compiler-option", "-fmodules")
         }
@@ -223,11 +226,6 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 }
 
 

common/src/commonMain/composeResources/values-cs/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Vyberte fiat měnu a bitcoinovou denominaci, aby se v peněžence zobrazovaly správné částky</string>
     <string name="id_select_account">Vybrat účet</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Vyberte aplikaci na %1$s</string>
     <string name="id_select_asset">Vybrat aktivum</string>
     <string name="id_select_duration_of_twofactor">Vybrat dobu trvání ochrany dvoufaktorovým ověřováním vašich mincí. Nová možnost se vztahuje na nově přijaté mince.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Čekání na transakci…</string>
     <string name="id_wallet">Peněženka</string>
     <string name="id_wallet_already_restored">Peněženka již byla obnovena</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Aktiva peněženky</string>
     <string name="id_wallet_backup">Záloha peněženky</string>
     <string name="id_wallet_coins_will_require">Mince peněženky budou vyžadovat dvoufaktorovou reaktivaci jednou ročně, aby zůstaly chráněny dvoufaktorovou autentizací.</string>

common/src/commonMain/composeResources/values-de/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Wähle eine Fiat-Währung und eine Bitcoin-Denominierung aus, um die Beträge in deiner Wallet anzuzeigen.</string>
     <string name="id_select_account">Wähle Konto</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Wähle eine App auf %1$s</string>
     <string name="id_select_asset">Wählen Sie das Vermögen</string>
     <string name="id_select_duration_of_twofactor">Wähle die Dauer des Zwei-Faktor-Authentifizierungsschutzes für deine Coins. Die neu gewählte Option gilt nur für neu erhaltene Coins.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Warten auf Transaktion...</string>
     <string name="id_wallet">Wallet</string>
     <string name="id_wallet_already_restored">Wallet bereits wiederhergestellt</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Wallet-Assets</string>
     <string name="id_wallet_backup">Wallet Backup</string>
     <string name="id_wallet_coins_will_require">Coins in der Wallet werden einmal im Jahr die Zwei-Faktor-Reaktivierung benötigen, um mit Zwei-Faktor-Authentifizierung beschützt zu bleiben</string>

common/src/commonMain/composeResources/values-es/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Seleccione una divisa fiat y una denominación de bitcóin y le mostraremos los montos correspondientes en su cartera.</string>
     <string name="id_select_account">Seleccionar cuenta</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Seleccione una app en %1$s</string>
     <string name="id_select_asset">Seleccionar activo</string>
     <string name="id_select_duration_of_twofactor">Seleccione el plazo de protección de sus monedas mediante autenticación de dos factores. Esta nueva opción se aplica a monedas recibidas recientemente.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Esperando transacción...</string>
     <string name="id_wallet">Cartera</string>
     <string name="id_wallet_already_restored">La cartera ya se restauró</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Activos de la cartera</string>
     <string name="id_wallet_backup">Respaldo de la cartera</string>
     <string name="id_wallet_coins_will_require">Las monedas de la cartera seguirán estando protegidas por la autenticación de dos factores siempre y cuando la reactive una vez por año.</string>

common/src/commonMain/composeResources/values-fr/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Sélectionnez une devise fiat et une dénomination bitcoin pour afficher les montants dans votre portefeuille.</string>
     <string name="id_select_account">Sélectionner le compte</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Sélectionner une app sur %1$s</string>
     <string name="id_select_asset">Sélectionner l&apos;actif</string>
     <string name="id_select_duration_of_twofactor">Sélectionnez la durée de la protection par authentification à deux facteurs pour vos pièces. La nouvelle option s&apos;applique aux pièces nouvellement reçues.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">En attente de la transaction...</string>
     <string name="id_wallet">Portefeuille</string>
     <string name="id_wallet_already_restored">Portefeuille déjà restauré</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Actifs du portefeuille</string>
     <string name="id_wallet_backup">Portefeuille Backup</string>
     <string name="id_wallet_coins_will_require">Les pièces du portefeuille devront être réactivées une fois par an pour rester protégées par l&apos;authentification à deux facteurs.</string>

common/src/commonMain/composeResources/values-he/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Select a fiat currency and bitcoin denomination to show amounts in your wallet</string>
     <string name="id_select_account">Select Account</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Select an app on %1$s</string>
     <string name="id_select_asset">Select asset</string>
     <string name="id_select_duration_of_twofactor">Select duration of Two-Factor Authentication protection for your coins. The new option applies to newly received coins.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Waiting for transaction…</string>
     <string name="id_wallet">Wallet</string>
     <string name="id_wallet_already_restored">Wallet already restored</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Wallet Assets</string>
     <string name="id_wallet_backup">Wallet Backup</string>
     <string name="id_wallet_coins_will_require">Wallet coins will require two-factor reactivation once a year to remain protected by two-factor authentication.</string>

common/src/commonMain/composeResources/values-it/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Seleziona una valuta fiat e una denominazione bitcoin per mostrare gli importi nel tuo wallet</string>
     <string name="id_select_account">Seleziona Account</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Seleziona un&apos;app su %1$s</string>
     <string name="id_select_asset">Seleziona asset</string>
     <string name="id_select_duration_of_twofactor">Seleziona la durata dell&apos;Autenticazione a Due Fattori per i tuoi coin. La nuova opzione è valida per i coin appena ricevuti.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">In attesa della transazione…</string>
     <string name="id_wallet">Wallet</string>
     <string name="id_wallet_already_restored">Wallet già ripristinato</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Wallet Assets</string>
     <string name="id_wallet_backup">Backup wallet </string>
     <string name="id_wallet_coins_will_require">Per preservare l&apos;autenticazione a due fattori dei coin del tuo wallet sarà necessaria una riattivazione a due fattori una volta all&apos;anno.</string>

common/src/commonMain/composeResources/values-ja/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">ウォレット内の金額表示に利用する法定通貨とビットコインの単位を選択してください</string>
     <string name="id_select_account">アカウントを選択</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">%1$sでアプリを選択してください</string>
     <string name="id_select_asset">アセットを選択</string>
     <string name="id_select_duration_of_twofactor">2段階認証による保護の期間を設定します。新しい設定はこれから受け取るコインにのみ適用されます。</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">トランザクション待機中…</string>
     <string name="id_wallet">ウォレット</string>
     <string name="id_wallet_already_restored">このウォレットは復元済みです</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">ウォレット内のアセット</string>
     <string name="id_wallet_backup">ウォレットのバックアップ</string>
     <string name="id_wallet_coins_will_require">ウォレット内のコインの2段階認証による保護を継続するには毎年保護の再アクティベーションが必要になります。</string>

common/src/commonMain/composeResources/values-nl/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Selecteer een fiat-munteenheid en bitcoin-denominatie om bedragen in je wallet weer te geven</string>
     <string name="id_select_account">Selecteer account</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Selecteer een app op %1$s</string>
     <string name="id_select_asset">Selecteer asset</string>
     <string name="id_select_duration_of_twofactor">Selecteer de duur van de tweetrapsauthenticatie-bescherming voor je munten. De nieuwe optie is van toepassing op nieuw ontvangen munten.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Wachten op transactie…</string>
     <string name="id_wallet">Wallet</string>
     <string name="id_wallet_already_restored">Wallet al hersteld</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Wallet-assets</string>
     <string name="id_wallet_backup">Wallet-back-up</string>
     <string name="id_wallet_coins_will_require">Wallet-munten moeten eenmaal per jaar opnieuw worden geactiveerd met tweetrapsauthenticatie om beschermd te blijven.</string>

common/src/commonMain/composeResources/values-pt-rBR/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Escolha uma moeda fiduciária e a unidade de bitcoin que serão usadas para mostrar valores na sua carteira. </string>
     <string name="id_select_account">Selecionar conta</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Selecione um aplicativo em%1$s</string>
     <string name="id_select_asset">Selecionar ativo</string>
     <string name="id_select_duration_of_twofactor">Selecione um intervalo de tempo em que suas moedas estarão protegidas por 2FA. A nova opção se aplica às moedas recém-recebidas.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Aguardando transação…</string>
     <string name="id_wallet">Carteira</string>
     <string name="id_wallet_already_restored">Carteira já restaurada</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Ativos da carteira</string>
     <string name="id_wallet_backup">Backup da carteira</string>
     <string name="id_wallet_coins_will_require">É necessário reativar o 2FA a cada ano para que os fundos permaneçam protegidos por esta camada extra de segurança.</string>

common/src/commonMain/composeResources/values-ro/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Selectați o monedă fiat și o denominare în bitcoin pentru a afișa cantitățile aflate în portofelul dvs</string>
     <string name="id_select_account">Selectați Contul</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Selectați o aplicație în %1$s</string>
     <string name="id_select_asset">Selectați moneda</string>
     <string name="id_select_duration_of_twofactor">Selectați durata protecției cu Autentificare cu Doi Factori (2FA) pentru monedele dvs. Noua opțiune va fi aplicată monedelor nou-primite.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Se așteaptă tranzacția...</string>
     <string name="id_wallet">Wallet</string>
     <string name="id_wallet_already_restored">Wallet already restored</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Wallet Assets</string>
     <string name="id_wallet_backup">Copie de protecție pentru portofel</string>
     <string name="id_wallet_coins_will_require">Monedele din portofel vor avea nevoie de o reactivare a autentificării cu doi factori o dată pe an, cu scopul de a păstra această protecție.</string>

common/src/commonMain/composeResources/values-ru/strings.xml

@@ -1100,7 +1100,7 @@
     <string name="id_segwit_bip84">SegWit (BIP84)</string>
     <string name="id_select_a_fiat_currency_and">Выберите фиатную валюту и номинал биткоинов, чтобы отобразить суммы в вашем кошельке</string>
     <string name="id_select_account">Выберите аккаунт</string>
-    <string name="id_select_account_amp_asset">Select account &amp;amp; asset</string>
+    <string name="id_select_account_amp_asset">Select account &amp; asset</string>
     <string name="id_select_an_app_on_s">Выберите приложение на %1$s</string>
     <string name="id_select_asset">Выберите актив</string>
     <string name="id_select_duration_of_twofactor">Выберите продолжительность защиты ваших монет двухфакторной аутентификацией. Эта новая опция применяется к вновь полученным монетам.</string>
@@ -1413,6 +1413,7 @@
     <string name="id_waiting_for_transaction">Ожидание транзакции ...</string>
     <string name="id_wallet">Кошелек</string>
     <string name="id_wallet_already_restored">Кошелек уже восстановлен</string>
+    <string name="id_wallet_already_restored_s">Wallet already restored: %1$s</string>
     <string name="id_wallet_assets">Активы кошелька</string>
     <string name="id_wallet_backup">Резервное копирование кошелька</string>
     <string name="id_wallet_coins_will_require">Монеты кошелька требуют двухфакторной реактивации один раз в год, чтобы оставаться защищенными двухфакторной аутентификацией.</string>