zec
/
zcash-android-wallet
mirror of https://github.com/zcash/zcash-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#335] Adopt SDK 1.9 ZcashNetwork API changes

This commit is contained in:
Carter Jernigan 2022-08-02 13:58:25 -04:00 committed by Carter Jernigan
parent 84aa6b6014
commit f9c12321ee
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/cash/z/ecc/android/integration/IntegrationTest.kt
View File

@ -5,7 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import cash.z.ecc.android.lockbox.LockBox
import cash.z.ecc.android.sdk.Initializer
import cash.z.ecc.android.sdk.type.ZcashNetwork
import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.kotlin.mnemonic.Mnemonics
import kotlinx.coroutines.test.runTest
import okio.Buffer

2
app/src/main/java/cash/z/ecc/android/ZcashWalletApp.kt
View File

@ -11,7 +11,7 @@ import cash.z.ecc.android.feedback.FeedbackCoordinator
import cash.z.ecc.android.sdk.ext.ZcashSdk
import cash.z.ecc.android.sdk.internal.Twig
import cash.z.ecc.android.sdk.model.Zatoshi
import cash.z.ecc.android.sdk.type.ZcashNetwork
import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.android.util.twig
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers

13
app/src/main/java/cash/z/ecc/android/ui/settings/SettingsViewModel.kt
View File

@ -51,17 +51,12 @@ class SettingsViewModel @Inject constructor() : ViewModel() {
}
suspend fun submit() {
var error: Throwable? = null
// Note: this only takes effect after the app is relaunched
val host = uiModels.value.host
val port = uiModels.value.portInt
synchronizer.changeServer(uiModels.value.host, uiModels.value.portInt) {
error = it
}
if (error == null) {
prefs[Const.Pref.SERVER_HOST] = host
prefs[Const.Pref.SERVER_PORT] = port
}
uiModels.value = uiModels.value.copy(changeError = error, complete = true)
prefs[Const.Pref.SERVER_HOST] = host
prefs[Const.Pref.SERVER_PORT] = port
uiModels.value = uiModels.value.copy(changeError = null, complete = true)
}
private fun onUpdateModel(kProperty: KProperty<*>, old: String, new: String) {

2
app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt
View File

@ -25,7 +25,7 @@ import cash.z.ecc.android.feedback.Report.Tap.LANDING_BACKUP_SKIPPED_3
import cash.z.ecc.android.feedback.Report.Tap.LANDING_NEW
import cash.z.ecc.android.feedback.Report.Tap.LANDING_RESTORE
import cash.z.ecc.android.sdk.model.BlockHeight
import cash.z.ecc.android.sdk.type.ZcashNetwork
import cash.z.ecc.android.sdk.model.ZcashNetwork
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

5
app/src/main/java/cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt
View File

@ -11,9 +11,10 @@ import cash.z.ecc.android.lockbox.LockBox
import cash.z.ecc.android.sdk.Initializer
import cash.z.ecc.android.sdk.exception.InitializerException
import cash.z.ecc.android.sdk.model.BlockHeight
import cash.z.ecc.android.sdk.model.LightWalletEndpoint
import cash.z.ecc.android.sdk.tool.DerivationTool
import cash.z.ecc.android.sdk.type.UnifiedViewingKey
import cash.z.ecc.android.sdk.type.ZcashNetwork
import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.android.ui.setup.WalletSetupViewModel.WalletSetupState.*
import cash.z.ecc.android.util.twig
import cash.z.ecc.kotlin.mnemonic.Mnemonics
@ -104,7 +105,7 @@ class WalletSetupViewModel @Inject constructor() : ViewModel() {
twig("Done loading config variables")
return Initializer.Config {
it.importWallet(vk, birthdayHeight, network, host, port)
it.importWallet(vk, birthdayHeight, network, LightWalletEndpoint(host, port, true))
it.setOverwriteKeys(overwriteVks)
}
}

2
buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
View File

@ -83,7 +83,7 @@ object Deps {
object Zcash {
const val ANDROID_WALLET_PLUGINS = "cash.z.ecc.android:zcash-android-wallet-plugins:1.0.0"
const val KOTLIN_BIP39 = "cash.z.ecc.android:kotlin-bip39:1.0.4"
const val SDK = "cash.z.ecc.android:zcash-android-sdk:1.8.0-beta01"
const val SDK = "cash.z.ecc.android:zcash-android-sdk:1.9.0-beta01"
}
object Misc {
const val LOTTIE = "com.airbnb.android:lottie:3.7.0"