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

Merge pull request #180 from zcash/feature/show-scan-error 

Feature: show message for scan errors.
This commit is contained in:
Kevin Gorham 2020-07-02 18:27:14 -04:00 committed by GitHub
parent 93b0ba36cc e3a243259b
commit f6622d2320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/cash/z/ecc/android/ui/scan/ScanFragment.kt
View File

@ -18,6 +18,7 @@ import cash.z.ecc.android.ext.onClickNavTo
import cash.z.ecc.android.feedback.Report
import cash.z.ecc.android.feedback.Report.Tap.SCAN_BACK
import cash.z.ecc.android.feedback.Report.Tap.SCAN_RECEIVE
import cash.z.ecc.android.sdk.ext.ZcashSdk
import cash.z.ecc.android.sdk.ext.twig
import cash.z.ecc.android.ui.base.BaseFragment
import cash.z.ecc.android.ui.send.SendViewModel
@ -125,8 +126,13 @@ class ScanFragment : BaseFragment<FragmentScanBinding>() {
private fun onQrScanned(qrContent: String, image: ImageProxy) {
resumedScope.launch {
if (viewModel.isNotValid(qrContent)) image.close() // continue scanning
else {
if (viewModel.isNotValid(qrContent)) {
//todo: use the "NETWORK" constant that will be available in the next SDK build
val network = ZcashSdk.DEFAULT_DB_NAME_PREFIX.split("_")[1]
binding.textScanError.text = "Invalid Zcash $network address:\n$qrContent"
image.close()
} else { /* continue scanning*/
binding.textScanError.text = ""
sendViewModel.toAddress = qrContent
mainActivity?.safeNavigate(R.id.action_nav_scan_to_nav_send_address)
}

17
app/src/main/res/layout/fragment_scan.xml
View File

@ -150,6 +150,23 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/text_scan_error"
android:layout_width="0dp"
android:layout_height="0dp"
android:fontFamily="@font/inconsolata"
android:gravity="center"
android:textColor="@color/text_light_dimmed"
android:textSize="16dp"
android:ellipsize="end"
android:paddingBottom="16dp"
android:paddingTop="8dp"
app:layout_constraintBottom_toTopOf="@id/button_receive"
app:layout_constraintEnd_toEndOf="@id/scan_frame"
app:layout_constraintStart_toStartOf="@id/scan_frame"
app:layout_constraintTop_toBottomOf="@id/scan_frame"
tools:text="invalid:\nz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuz z98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuzz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuzz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuzz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuzz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuzz98yz9uhz98uyz988yz98hzu8hgziouzgi9uzg9z8uogozuz" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_receive"
android:layout_width="0dp"