From fa0692ceaba9affe8d2eee5133382186cc39e1e1 Mon Sep 17 00:00:00 2001
From: m2049r <m2049r@monerujo.io>
Date: Mon, 21 Sep 2020 14:36:17 +0200
Subject: [PATCH] force agree for fingerprint send (#682)
---
.../com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java | 4 ++++
.../com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java
index 0acc18f5..e0b232e1 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingActivity.java
@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
import com.m2049r.xmrwallet.LoginActivity;
import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;
public class OnBoardingActivity extends AppCompatActivity implements OnBoardingAdapter.Listener {
@@ -75,6 +76,9 @@ public class OnBoardingActivity extends AppCompatActivity implements OnBoardingA
}
});
+ // let old users who have fingerprint wallets already agree for fingerprint sending
+ OnBoardingScreen.FPSEND.setMustAgree(KeyStoreHelper.hasStoredPasswords(this));
+
for (int i = 0; i < OnBoardingScreen.values().length; i++) {
agreed[i] = !OnBoardingScreen.values()[i].isMustAgree();
}
diff --git a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java
index d731d621..c6227d54 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingScreen.java
@@ -28,7 +28,7 @@ enum OnBoardingScreen {
private final int title;
private final int information;
private final int drawable;
- private final boolean mustAgree;
+ private boolean mustAgree;
OnBoardingScreen(final int title, final int information, final int drawable, final boolean mustAgree) {
this.title = title;
@@ -52,4 +52,8 @@ enum OnBoardingScreen {
public boolean isMustAgree() {
return mustAgree;
}
+
+ public boolean setMustAgree(boolean mustAgree) {
+ return this.mustAgree = mustAgree;
+ }
}