From bf26eb7b7896f5e43be5c43a12cd117ab091d567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Thu, 3 Apr 2025 13:18:51 +0200 Subject: [PATCH 1/5] [#1843] Release v1.5.2 Closes #1843 --- CHANGELOG.md | 11 +++++++++++ docs/whatsNew/WHATS_NEW_EN.md | 6 ++++++ docs/whatsNew/WHATS_NEW_ES.md | 6 ++++++ fastlane/metadata/android/en-US/changelogs/926.txt | 3 +++ fastlane/metadata/android/es/changelogs/926.txt | 3 +++ gradle.properties | 4 ++-- 6 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/926.txt create mode 100644 fastlane/metadata/android/es/changelogs/926.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 52c34e3f7..050ef210d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,17 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] +## [1.5.2 (926)] - 2025-04-03 + +### Changed +- Adopted Zcash SDK v2.2.11 + +### Fixed +- Database migration bugs in SDK's `zcash_client_sqlite 0.16.0` and `0.16.1` have + been fixed by updating to `zcash_client_sqlite 0.16.2`. These caused a few + wallets to stop working after the Zcash SDK v2.2.9 upgrade due to failed database + migrations. + ## [1.5.1 (925)] - 2025-03-31 ### Changed diff --git a/docs/whatsNew/WHATS_NEW_EN.md b/docs/whatsNew/WHATS_NEW_EN.md index 713bc7875..a13128700 100644 --- a/docs/whatsNew/WHATS_NEW_EN.md +++ b/docs/whatsNew/WHATS_NEW_EN.md @@ -12,6 +12,12 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +## [1.5.2 (926)] - 2025-04-03 + +### Fixed: +- 1.5 Bug Fix release! +- We fixed a migration issue impacting some users on 1.5 app version. + ## [1.5.1 (925)] - 2025-03-31 ### Added: diff --git a/docs/whatsNew/WHATS_NEW_ES.md b/docs/whatsNew/WHATS_NEW_ES.md index f5525a30c..9fa14538d 100644 --- a/docs/whatsNew/WHATS_NEW_ES.md +++ b/docs/whatsNew/WHATS_NEW_ES.md @@ -12,6 +12,12 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +## [1.5.2 (926)] - 2025-04-03 + +### Corregido: +- ¡Corrección de errores 1.5! +- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app. + ## [1.5.1 (925)] - 2025-03-31 ### Añadido: diff --git a/fastlane/metadata/android/en-US/changelogs/926.txt b/fastlane/metadata/android/en-US/changelogs/926.txt new file mode 100644 index 000000000..018da9c9a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/926.txt @@ -0,0 +1,3 @@ +Fixed: +- 1.5 Bug Fix release! +- We fixed a migration issue impacting some users on 1.5 app version. \ No newline at end of file diff --git a/fastlane/metadata/android/es/changelogs/926.txt b/fastlane/metadata/android/es/changelogs/926.txt new file mode 100644 index 000000000..1f1a1029e --- /dev/null +++ b/fastlane/metadata/android/es/changelogs/926.txt @@ -0,0 +1,3 @@ +Corregido: +- ¡Corrección de errores 1.5! +- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index efd38703a..f4b49f4dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,7 +61,7 @@ NDK_DEBUG_SYMBOL_LEVEL=symbol_table # VERSION_CODE is effectively ignored. VERSION_NAME is suffixed with the version code. # If not using automated Google Play deployment, then these serve as the actual version numbers. ZCASH_VERSION_CODE=1 -ZCASH_VERSION_NAME=1.5.1 +ZCASH_VERSION_NAME=1.5.2 # Set these fields, as you need them (e.g. with values "Zcash X" and "co.electriccoin.zcash.x") # to distinguish a different release build that can be installed alongside the official version @@ -211,7 +211,7 @@ ZIP_321_VERSION = 0.0.6 # WARNING: Ensure a non-snapshot version is used before releasing to production ZCASH_BIP39_VERSION=1.0.9 # WARNING: Ensure a non-snapshot version is used before releasing to production -ZCASH_SDK_VERSION=2.2.10-SNAPSHOT +ZCASH_SDK_VERSION=2.2.11-SNAPSHOT # Toolchain is the Java version used to build the application, which is separate from the # Java version used to run the application. From 79a2e87c2a69cff6ead94bf79843869837421927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Mon, 7 Apr 2025 13:29:15 +0200 Subject: [PATCH 2/5] [#1846] Remove Security Warning from FOSS - Closes #1846 --- CHANGELOG.md | 3 +++ .../zcash/ui/screen/onboarding/AndroidOnboarding.kt | 10 +++++++++- .../screen/onboarding/viewmodel/OnboardingViewModel.kt | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050ef210d..a3c1b6f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] +### Changed +- The Security Warning screen has been removed from onboarding of the FOSS app build type + ## [1.5.2 (926)] - 2025-04-03 ### Changed diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt index 1b6b07d87..26fdadc7a 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt @@ -15,6 +15,7 @@ import co.electriccoin.zcash.spackle.FirebaseTestLabUtil import co.electriccoin.zcash.ui.common.compose.LocalActivity import co.electriccoin.zcash.ui.common.model.OnboardingState import co.electriccoin.zcash.ui.common.model.VersionInfo +import co.electriccoin.zcash.ui.common.model.WalletRestoringState import co.electriccoin.zcash.ui.common.viewmodel.WalletViewModel import co.electriccoin.zcash.ui.screen.onboarding.view.Onboarding import co.electriccoin.zcash.ui.screen.onboarding.viewmodel.OnboardingViewModel @@ -34,7 +35,14 @@ internal fun WrapOnboarding() { if (!onboardingViewModel.isImporting.collectAsStateWithLifecycle().value) { val onCreateWallet = { - walletViewModel.persistOnboardingState(OnboardingState.NEEDS_WARN) + walletViewModel.persistOnboardingState( + if (onboardingViewModel.isSecurityScreenAllowed) { + OnboardingState.NEEDS_WARN + } else { + walletViewModel.persistNewWalletAndRestoringState(WalletRestoringState.INITIATING) + OnboardingState.NEEDS_BACKUP + } + ) } val onImportWallet = { // In the case of the app currently being messed with by the robo test runner on diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt index a5199f748..c3ec37699 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt @@ -3,6 +3,8 @@ package co.electriccoin.zcash.ui.screen.onboarding.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.SavedStateHandle +import co.electriccoin.zcash.ui.common.model.DistributionDimension +import co.electriccoin.zcash.ui.common.provider.GetVersionInfoProvider /* * Android-specific ViewModel. This is used to save and restore state across Activity recreations @@ -10,13 +12,16 @@ import androidx.lifecycle.SavedStateHandle */ class OnboardingViewModel( application: Application, - private val savedStateHandle: SavedStateHandle + private val savedStateHandle: SavedStateHandle, + getVersionInfo: GetVersionInfoProvider, ) : AndroidViewModel(application) { // This is a bit weird being placed here, but onboarding currently is considered complete when // the user has a persisted wallet. Also import allows the user to go back to onboarding, while // creating a new wallet does not. val isImporting = savedStateHandle.getStateFlow(KEY_IS_IMPORTING, false) + val isSecurityScreenAllowed = getVersionInfo().distributionDimension == DistributionDimension.STORE + fun setIsImporting(isImporting: Boolean) { savedStateHandle[KEY_IS_IMPORTING] = isImporting } From c10f6a7d58372b3e244197d002d1525e5e4cb135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Tue, 8 Apr 2025 11:52:04 +0200 Subject: [PATCH 3/5] Adopt production Zcash SDK v2.2.11 (#1848) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f4b49f4dc..accf27adf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -211,7 +211,7 @@ ZIP_321_VERSION = 0.0.6 # WARNING: Ensure a non-snapshot version is used before releasing to production ZCASH_BIP39_VERSION=1.0.9 # WARNING: Ensure a non-snapshot version is used before releasing to production -ZCASH_SDK_VERSION=2.2.11-SNAPSHOT +ZCASH_SDK_VERSION=2.2.11 # Toolchain is the Java version used to build the application, which is separate from the # Java version used to run the application. From be84f4e5b034625db4fb2f4cf1207d9d2ae35dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Wed, 9 Apr 2025 11:10:03 +0200 Subject: [PATCH 4/5] [#1849] Release 1.5.2 (929) --- CHANGELOG.md | 2 ++ docs/whatsNew/WHATS_NEW_EN.md | 9 +++++++++ docs/whatsNew/WHATS_NEW_ES.md | 8 ++++++++ fastlane/metadata/android/en-US/changelogs/929.txt | 5 +++++ fastlane/metadata/android/es/changelogs/929.txt | 5 +++++ 5 files changed, 29 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/929.txt create mode 100644 fastlane/metadata/android/es/changelogs/929.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c1b6f3d..90ca52ca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] +## [1.5.2 (929)] - 2025-04-09 + ### Changed - The Security Warning screen has been removed from onboarding of the FOSS app build type diff --git a/docs/whatsNew/WHATS_NEW_EN.md b/docs/whatsNew/WHATS_NEW_EN.md index a13128700..560c3d0b7 100644 --- a/docs/whatsNew/WHATS_NEW_EN.md +++ b/docs/whatsNew/WHATS_NEW_EN.md @@ -12,6 +12,15 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +## [1.5.2 (929)] - 2025-04-09 + +### Fixed +- 1.5 Bug Fix release! +- We fixed a migration issue impacting some users on 1.5 app version. +- We also removed the redundant Security Warning screen which was incorrectly informing the user about crash + reporting not included in Zashi Android FOSS version. + + ## [1.5.2 (926)] - 2025-04-03 ### Fixed: diff --git a/docs/whatsNew/WHATS_NEW_ES.md b/docs/whatsNew/WHATS_NEW_ES.md index 9fa14538d..e34e92ec0 100644 --- a/docs/whatsNew/WHATS_NEW_ES.md +++ b/docs/whatsNew/WHATS_NEW_ES.md @@ -12,6 +12,14 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +## [1.5.2 (929)] - 2025-04-09 + +### Corregido +- ¡Corrección de errores 1.5! +- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app. +- También eliminamos la pantalla de Advertencia de Seguridad redundante que informaba incorrectamente al usuario + sobre informes de fallas no incluidos en la versión Zashi Android FOSS. + ## [1.5.2 (926)] - 2025-04-03 ### Corregido: diff --git a/fastlane/metadata/android/en-US/changelogs/929.txt b/fastlane/metadata/android/en-US/changelogs/929.txt new file mode 100644 index 000000000..d0b3b2cfc --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/929.txt @@ -0,0 +1,5 @@ +Fixed: +- 1.5 Bug Fix release! +- We fixed a migration issue impacting some users on 1.5 app version. +- We also removed the redundant Security Warning screen which was incorrectly informing the user about crash reporting +not included in Zashi Android FOSS version. \ No newline at end of file diff --git a/fastlane/metadata/android/es/changelogs/929.txt b/fastlane/metadata/android/es/changelogs/929.txt new file mode 100644 index 000000000..bf9843d98 --- /dev/null +++ b/fastlane/metadata/android/es/changelogs/929.txt @@ -0,0 +1,5 @@ +Corregido: +- ¡Corrección de errores 1.5! +- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app. +- También eliminamos la pantalla de Advertencia de Seguridad redundante que informaba incorrectamente al usuario sobre +informes de fallas no incluidos en la versión Zashi Android FOSS. \ No newline at end of file From 7cc98528e98617b397ea450ef19abfa6b6c029c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 15:01:58 +0200 Subject: [PATCH 5/5] Bump actions/setup-java from 4.7.0 to 4.7.1 (#1851) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.7.0 to 4.7.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/3a4f6e1af504cf6a31855fa899c6aa5355ba6c12...c5195efecf7bdfc987ee8bae7a71cb8b11521c00) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yml | 2 +- .github/workflows/pull-request.yml | 22 +++++++++++----------- .github/workflows/release.yaml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9fa39f664..971546d80 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -82,7 +82,7 @@ jobs: ref: main fetch-depth: 0 # To fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 83823ae80..1b26d2332 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -85,7 +85,7 @@ jobs: with: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -110,7 +110,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -152,7 +152,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -194,7 +194,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -239,7 +239,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -285,7 +285,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -351,7 +351,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -401,7 +401,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -454,7 +454,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -513,7 +513,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' @@ -608,7 +608,7 @@ jobs: with: fetch-depth: 0 # to fetch all commits - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 87e6e67d8..c50efc6c7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -70,7 +70,7 @@ jobs: gpg --import private.pgp - name: Set up Java - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 timeout-minutes: 1 with: distribution: 'temurin'