bump version 1.14.7

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 404
-        versionName "1.14.4 'On Board'"
+        versionCode 407
+        versionName "1.14.7 'On Board'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java

@@ -16,24 +16,15 @@
 
 package com.m2049r.xmrwallet.fragment.send;
 
-import android.app.Activity;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.design.widget.TextInputLayout;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.TxDataBtc;
@@ -353,7 +344,9 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
             }
 
             public void fail(String walletName, String password, boolean fingerprintUsed) {
-                bSend.setEnabled(sendCountdown > 0); // allow to try again
+                getActivity().runOnUiThread(() -> {
+                    bSend.setEnabled(sendCountdown > 0); // allow to try again
+                });
             }
         });
     }

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java

@@ -16,29 +16,19 @@
 
 package com.m2049r.xmrwallet.fragment.send;
 
-import android.app.Activity;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
 import android.widget.TextView;
 
-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.TxData;
+import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.data.UserNotes;
 
 import timber.log.Timber;
 
@@ -237,7 +227,9 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
             }
 
             public void fail(String walletName, String password, boolean fingerprintUsed) {
-                bSend.setEnabled(true); // allow to try again
+                getActivity().runOnUiThread(() -> {
+                    bSend.setEnabled(true); // allow to try again
+                });
             }
         });
     }

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();
         }
@@ -83,6 +87,7 @@ public class OnBoardingActivity extends AppCompatActivity implements OnBoardingA
     }
 
     private void finishOnboarding() {
+        nextButton.setEnabled(false);
         OnBoardingManager.setOnBoardingShown(getApplicationContext());
         startActivity(new Intent(this, LoginActivity.class));
         finish();

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;
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/util/Notice.java

@@ -37,33 +37,19 @@ public class Notice {
     private static final String PREFS_NAME = "notice";
     private static List<Notice> notices = null;
 
-    private static final String NOTICE_SHOW_XMRTO_ENABLED_LOGIN = "notice_xmrto_enabled_login";
     private static final String NOTICE_SHOW_XMRTO_ENABLED_SEND = "notice_xmrto_enabled_send";
     private static final String NOTICE_SHOW_LEDGER = "notice_ledger_enabled_login";
-    private static final String NOTICE_SHOW_NODES = "notice_nodes";
 
     private static void init() {
         synchronized (Notice.class) {
             if (notices != null) return;
             notices = new ArrayList<>();
-            notices.add(
-                    new Notice(NOTICE_SHOW_NODES,
-                            R.string.info_nodes_enabled,
-                            R.string.help_node,
-                            1)
-            );
             notices.add(
                     new Notice(NOTICE_SHOW_XMRTO_ENABLED_SEND,
                             R.string.info_xmrto_enabled,
                             R.string.help_xmrto,
                             1)
             );
-            notices.add(
-                    new Notice(NOTICE_SHOW_XMRTO_ENABLED_LOGIN,
-                            R.string.info_xmrto_enabled,
-                            R.string.help_xmrto,
-                            1)
-            );
             notices.add(
                     new Notice(NOTICE_SHOW_LEDGER,
                             R.string.info_ledger_enabled,

app/src/main/res/layout/view_onboarding.xml

@@ -15,11 +15,25 @@
         android:layout_marginTop="32dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="32dp"
+        android:src="@drawable/gunther_24dp"
         app:layout_constraintBottom_toTopOf="@+id/onboardingTitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/gunther_24dp" />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/onboardingTitle"
+        style="@style/MoneroText.Balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/onboardingInformation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/onboarding_fpsend_title" />
 
     <TextView
         android:id="@+id/onboardingInformation"
@@ -29,32 +43,14 @@
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="16dp"
         android:gravity="center"
         android:lineSpacingMultiplier="1.2"
         app:layout_constraintBottom_toTopOf="@+id/onboardingAgree"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/onboardingTitle"
         tools:text="@string/onboarding_fpsend_information" />
 
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.6" />
-
-    <TextView
-        android:id="@+id/onboardingTitle"
-        style="@style/MoneroText.Balance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/guideline"
-        tools:text="@string/onboarding_fpsend_title" />
-
     <CheckBox
         android:id="@+id/onboardingAgree"
         style="@style/MoneroLabel.Caps.Black"
@@ -66,6 +62,5 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingInformation" />
+        app:layout_constraintStart_toStartOf="parent" />
 </android.support.constraint.ConstraintLayout>