From af8c3ad9ae6e4e7a84b525d96d7da843aadde38e Mon Sep 17 00:00:00 2001
From: Kevin Gorham <kevin.gorham@electriccoin.co>
Date: Sat, 19 Dec 2020 10:35:43 -0500
Subject: [PATCH] Miscellaneous minor changes.

---
 .../cash/z/ecc/android/ui/setup/LandingFragment.kt     | 10 ++++++++--
 .../main/java/cash/z/ecc/android/ui/util/MemoUtil.kt   |  1 +
 build.gradle                                           |  3 ++-
 feedback/build.gradle                                  |  4 +++-
 .../main/java/cash/z/ecc/android/lockbox/LockBox.kt    |  1 -
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt
index d800653..853098a 100644
--- a/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt
+++ b/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt
@@ -14,9 +14,11 @@ import cash.z.ecc.android.ext.toAppString
 import cash.z.ecc.android.feedback.Report
 import cash.z.ecc.android.feedback.Report.Funnel.Restore
 import cash.z.ecc.android.feedback.Report.Tap.*
+import cash.z.ecc.android.sdk.ext.twig
 import cash.z.ecc.android.ui.base.BaseFragment
 import cash.z.ecc.android.ui.setup.WalletSetupViewModel.WalletSetupState.SEED_WITHOUT_BACKUP
 import cash.z.ecc.android.ui.setup.WalletSetupViewModel.WalletSetupState.SEED_WITH_BACKUP
+import com.bugsnag.android.Bugsnag
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -117,7 +119,7 @@ class LandingFragment : BaseFragment<FragmentLandingBinding>() {
     // AKA import wallet
     private fun onUseDevWallet() {
         val seedPhrase = "still champion voice habit trend flight survey between bitter process artefact blind carbon truly provide dizzy crush flush breeze blouse charge solid fish spread"
-        val birthday = 663174 //991645
+        val birthday = 991645 //663174
         mainActivity?.apply {
             lifecycleScope.launch {
                 mainActivity?.startSync(walletSetup.importWallet(seedPhrase, birthday))
@@ -152,7 +154,11 @@ class LandingFragment : BaseFragment<FragmentLandingBinding>() {
                 mainActivity?.playSound("sound_receive_small.mp3")
                 mainActivity?.vibrateSuccess()
             } catch (t: Throwable) {
-                Toast.makeText(context, "Failed to create wallet", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, "Failed to create wallet. See logs for details. Try restarting the app.", Toast.LENGTH_SHORT).show()
+                twig("Failed to create wallet due to: $t")
+                mainActivity?.feedback?.report(t)
+                binding.buttonPositive.isEnabled = true
+                binding.buttonPositive.setText(R.string.landing_button_primary)
             }
         }
     }
diff --git a/app/src/main/java/cash/z/ecc/android/ui/util/MemoUtil.kt b/app/src/main/java/cash/z/ecc/android/ui/util/MemoUtil.kt
index 589e4fd..13f78ec 100644
--- a/app/src/main/java/cash/z/ecc/android/ui/util/MemoUtil.kt
+++ b/app/src/main/java/cash/z/ecc/android/ui/util/MemoUtil.kt
@@ -20,6 +20,7 @@ val INCLUDE_MEMO_PREFIXES_RECOGNIZED = arrayOf(
     "sent from"                     // previous standard w/o colon
 )
 
+// TODO: move this to the SDK
 inline fun ByteArray?.toUtf8Memo(): String {
 // TODO: make this more official but for now, this will do
     return if (this == null || this[0] >= 0xF5) "" else try {
diff --git a/build.gradle b/build.gradle
index e7046b0..795df34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,4 +30,5 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-defaultTasks 'clean', 'installZcashmainnetRelease'
\ No newline at end of file
+defaultTasks 'clean', 'installZcashmainnetRelease'
+
diff --git a/feedback/build.gradle b/feedback/build.gradle
index 7aba54b..ff7c6b1 100644
--- a/feedback/build.gradle
+++ b/feedback/build.gradle
@@ -17,7 +17,9 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
-
+    kotlinOptions {
+        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/lockbox/src/main/java/cash/z/ecc/android/lockbox/LockBox.kt b/lockbox/src/main/java/cash/z/ecc/android/lockbox/LockBox.kt
index 584cf43..c70f575 100644
--- a/lockbox/src/main/java/cash/z/ecc/android/lockbox/LockBox.kt
+++ b/lockbox/src/main/java/cash/z/ecc/android/lockbox/LockBox.kt
@@ -1,7 +1,6 @@
 package cash.z.ecc.android.lockbox
 
 import android.content.Context
-import android.provider.Settings
 import cash.z.android.plugin.LockBoxPlugin
 import de.adorsys.android.securestoragelibrary.SecurePreferences
 import java.nio.ByteBuffer