From 5291a9d0a01af96a8b3f40887c8234516e2133e4 Mon Sep 17 00:00:00 2001 From: Kevin Gorham Date: Fri, 21 Jun 2019 18:38:52 -0400 Subject: [PATCH] Adding new keystore to try and help with play store protect issue. --- zcash-android-wallet-app/app/build.gradle | 6 +++--- .../wallet/ui/fragment/WelcomeFragment.kt | 3 +++ .../main/res/layout/fragment_zcon1_welcome.xml | 2 +- zcash-android-wallet-app/app/zcon1.keystore | Bin 0 -> 2465 bytes 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 zcash-android-wallet-app/app/zcon1.keystore diff --git a/zcash-android-wallet-app/app/build.gradle b/zcash-android-wallet-app/app/build.gradle index ea0e304..ce6cbb3 100644 --- a/zcash-android-wallet-app/app/build.gradle +++ b/zcash-android-wallet-app/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cash.z.android.zcon1" minSdkVersion buildConfig.minSdkVersion targetSdkVersion buildConfig.targetSdkVersion - versionCode 1_00_01 - versionName "1.0.1-alpha" + versionCode 1_00_02 + versionName "1.0.2-alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -57,7 +57,7 @@ android { signingConfigs { debug { debug { - storeFile file("debug.keystore") + storeFile file("zcon1.keystore") keyAlias "androiddebugkey" keyPassword "android" storePassword "android" diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/WelcomeFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/WelcomeFragment.kt index f06a62e..8331276 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/WelcomeFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/WelcomeFragment.kt @@ -1,6 +1,7 @@ package cash.z.android.wallet.ui.fragment import android.content.SharedPreferences +import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -8,6 +9,7 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.navigation.NavOptions import androidx.navigation.fragment.FragmentNavigatorExtras +import cash.z.android.wallet.BuildConfig import cash.z.android.wallet.R import cash.z.android.wallet.ZcashWalletApplication.Companion.PREFS_PSEUDONYM import cash.z.android.wallet.databinding.FragmentZcon1WelcomeBinding @@ -52,6 +54,7 @@ class WelcomeFragment : ProgressFragment(R.id.progress_welcome) { binding.lottieEccLogo.doOnComplete { launch { onNext() } } + binding.textWelcomeBuildInfo.text = "This application is running on testnet\nand only uses TAZ funds.\nVersion: ${BuildConfig.VERSION_NAME}" } override fun onResume() { diff --git a/zcash-android-wallet-app/app/src/main/res/layout/fragment_zcon1_welcome.xml b/zcash-android-wallet-app/app/src/main/res/layout/fragment_zcon1_welcome.xml index d789100..f8039db 100644 --- a/zcash-android-wallet-app/app/src/main/res/layout/fragment_zcon1_welcome.xml +++ b/zcash-android-wallet-app/app/src/main/res/layout/fragment_zcon1_welcome.xml @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="This application is running on testnet\nand only uses TAZ funds." + tools:text="This application is running on testnet\nand only uses TAZ funds." android:textColor="@color/text_light_dimmed" android:textSize="14dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/zcash-android-wallet-app/app/zcon1.keystore b/zcash-android-wallet-app/app/zcon1.keystore new file mode 100644 index 0000000000000000000000000000000000000000..8b94e681e13844a71780e3ee4cee37daba9dc6ce GIT binary patch literal 2465 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 OSwkHHO+a8^Z0=t)NQFoM literal 0 HcmV?d00001