Miscellaneous minor changes.

This commit is contained in:
Kevin Gorham 2020-12-19 10:35:43 -05:00
parent 5d301806e0
commit af8c3ad9ae
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
5 changed files with 14 additions and 5 deletions

View File

@ -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)
}
}
}

View File

@ -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 {

View File

@ -30,4 +30,5 @@ task clean(type: Delete) {
delete rootProject.buildDir
}
defaultTasks 'clean', 'installZcashmainnetRelease'
defaultTasks 'clean', 'installZcashmainnetRelease'

View File

@ -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

View File

@ -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