enc-backup: handle bad code more nicely

4 files changed, 61 insertions, 22 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java
index adf5ced8f..5dc16faba 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java
@@ -28,6 +28,7 @@ import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -53,7 +54,7 @@ public class BackupCodeEntryFragment extends Fragment {
 
     private ExportHelper mExportHelper;
     private EditText[] mCodeEditText;
-    private ViewAnimator mStatusAnimator;
+    private ViewAnimator mStatusAnimator, mTitleAnimator;
 
     public static BackupCodeEntryFragment newInstance(String backupCode) {
         BackupCodeEntryFragment frag = new BackupCodeEntryFragment();
@@ -96,24 +97,18 @@ public class BackupCodeEntryFragment extends Fragment {
         setupEditTextSuccessListener(mCodeEditText);
 
         mStatusAnimator = (ViewAnimator) view.findViewById(R.id.status_animator);
+        mTitleAnimator = (ViewAnimator) view.findViewById(R.id.title_animator);
 
-        View backupAll = view.findViewById(R.id.backup_all);
-        View backupPublicKeys = view.findViewById(R.id.backup_public_keys);
+        View backupSave = view.findViewById(R.id.button_backup_save);
+        View backupShare = view.findViewById(R.id.button_backup_share);
 
-        backupAll.setOnClickListener(new View.OnClickListener() {
+        backupSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startBackup(true);
             }
         });
 
-        backupPublicKeys.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startBackup(false);
-            }
-        });
-
         return view;
     }
 
@@ -140,7 +135,9 @@ public class BackupCodeEntryFragment extends Fragment {
                     }
                     // we could do this in better granularity in onTextChanged, but it's not worth it
                     mCurrentCodeInput.replace(index, index +s.length(), s.toString());
-                    checkIfMatchingCode();
+                    // if (s.length() == 6) {
+                        checkIfMatchingCode();
+                    // }
                 }
             });
 
@@ -149,15 +146,30 @@ public class BackupCodeEntryFragment extends Fragment {
 
     private void checkIfMatchingCode() {
 
+        for (EditText editText : mCodeEditText) {
+            if (editText.getText().length() < 6) {
+                return;
+            }
+        }
+
         // if they don't match, do nothing
         if (mCurrentCodeInput.toString().equals(mBackupCode)) {
             codeInputSuccessful();
+            return;
         }
 
         if (mCurrentCodeInput.toString().startsWith("ABC")) {
             codeInputSuccessful();
+            return;
         }
 
+        // we know all fields are filled, so if it's not the *right* one it's a *wrong* one!
+        @ColorInt int black = mCodeEditText[0].getCurrentTextColor();
+        @ColorInt int red = getResources().getColor(R.color.android_red_dark);
+        for (EditText editText : mCodeEditText) {
+            animateFlashText(editText, black, red, false);
+        }
+        mStatusAnimator.setDisplayedChild(1);
 
     }
 
@@ -170,21 +182,33 @@ public class BackupCodeEntryFragment extends Fragment {
 
         hideKeyboard();
 
+        mTitleAnimator.setDisplayedChild(1);
+        mStatusAnimator.setDisplayedChild(2);
+
         @ColorInt int black = mCodeEditText[0].getCurrentTextColor();
         @ColorInt int green = getResources().getColor(R.color.android_green_dark);
         for (EditText editText : mCodeEditText) {
-
-            ObjectAnimator anim = ObjectAnimator.ofArgb(editText, "textColor",
-                    black, green, black, green, black, green)
-                    .setDuration(1000);
-            anim.setInterpolator(new LinearInterpolator());
-            anim.start();
-
+            animateFlashText(editText, black, green, true);
             editText.setEnabled(false);
         }
 
-        mStatusAnimator.setDisplayedChild(2);
+    }
+
+    private void animateFlashText(EditText editText, int color1, int color2, boolean staySecondColor) {
+
+        ObjectAnimator anim;
+        if (staySecondColor) {
+            anim = ObjectAnimator.ofArgb(editText, "textColor",
+                    color1, color2, color1, color2, color1, color2);
+        } else {
+            anim = ObjectAnimator.ofArgb(editText, "textColor",
+                    color1, color2, color1, color2, color1);
+        }
 
+        anim.setDuration(1000);
+        anim.setStartDelay(200);
+        anim.setInterpolator(new LinearInterpolator());
+        anim.start();
     }
 
     private void setupEditTextFocusNext(final EditText[] backupCodes) {
diff --git a/OpenKeychain/src/main/res/anim/fade_in_delayed.xml b/OpenKeychain/src/main/res/anim/fade_in_delayed.xml
new file mode 100644
index 000000000..3f2887b5e
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/fade_in_delayed.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:interpolator="@android:anim/bounce_interpolator"
+        android:duration="700"
+        android:startOffset="400"
+        />
+</set>
diff --git a/OpenKeychain/src/main/res/anim/fade_out_delayed.xml b/OpenKeychain/src/main/res/anim/fade_out_delayed.xml
new file mode 100644
index 000000000..a895bdedd
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/fade_out_delayed.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="300"
+        android:startOffset="400"
+        />
+</set>
diff --git a/OpenKeychain/src/main/res/layout/backup_code_display_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_display_fragment.xml
index 01a98d253..b7fc5150b 100644
--- a/OpenKeychain/src/main/res/layout/backup_code_display_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/backup_code_display_fragment.xml
@@ -4,8 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="10dp"
-    android:gravity="center_vertical">
+    android:paddingTop="50dp">
 
     <TextView
         android:layout_width="wrap_content"