From 8eb10e4220959d9fbf00406a3c645d96cc286dae Mon Sep 17 00:00:00 2001
From: Jakob Nixdorf <flocke@shadowice.org>
Date: Wed, 28 Feb 2018 11:14:20 +0100
Subject: [PATCH] Third part of the authentication screen (still WIP)

TODO:
 * Actually save everything
 * Hand stuff over to the main activity on finish
---
 app/src/main/AndroidManifest.xml              |   2 +-
 ...Activity.java => IntroScreenActivity.java} | 110 +++++++++++++++++-
 .../andotp/Activities/MainActivity.java       |  37 +-----
 .../layout/component_intro_authentication.xml |   4 +-
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings_intro.xml     |   4 +
 6 files changed, 116 insertions(+), 43 deletions(-)
 rename app/src/main/java/org/shadowice/flocke/andotp/Activities/{MainIntroActivity.java => IntroScreenActivity.java} (68%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 32edd74a..9f822063 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
             android:parentActivityName=".Activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".Activities.MainIntroActivity"
+            android:name=".Activities.IntroScreenActivity"
             android:parentActivityName=".Activities.MainActivity"
             android:theme="@style/Theme.Intro" />
         <activity
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainIntroActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/IntroScreenActivity.java
similarity index 68%
rename from app/src/main/java/org/shadowice/flocke/andotp/Activities/MainIntroActivity.java
rename to app/src/main/java/org/shadowice/flocke/andotp/Activities/IntroScreenActivity.java
index 6c82517f..945889ed 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainIntroActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/IntroScreenActivity.java
@@ -1,24 +1,31 @@
 package org.shadowice.flocke.andotp.Activities;
 
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
 import android.app.KeyguardManager;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
+import android.text.method.PasswordTransformationMethod;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
+import com.heinrichreimersoftware.materialintro.app.OnNavigationBlockedListener;
 import com.heinrichreimersoftware.materialintro.app.SlideFragment;
 import com.heinrichreimersoftware.materialintro.slide.FragmentSlide;
 import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
@@ -26,8 +33,9 @@ import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 import org.shadowice.flocke.andotp.R;
 import org.shadowice.flocke.andotp.Utilities.Constants;
 import org.shadowice.flocke.andotp.Utilities.Settings;
+import org.shadowice.flocke.andotp.Utilities.UIHelper;
 
-public class MainIntroActivity extends IntroActivity {
+public class IntroScreenActivity extends IntroActivity {
     private Settings settings;
 
     private EncryptionFragment encryptionFragment;
@@ -69,12 +77,21 @@ public class MainIntroActivity extends IntroActivity {
                 .build()
         );
 
+        authenticationFragment.setSlidePos(2);
         addSlide(new FragmentSlide.Builder()
                 .background(R.color.colorPrimary)
                 .backgroundDark(R.color.colorPrimaryDark)
                 .fragment(authenticationFragment)
                 .build()
         );
+
+        addOnNavigationBlockedListener(new OnNavigationBlockedListener() {
+            @Override
+            public void onNavigationBlocked(int position, int direction) {
+                if (position == 2)
+                    authenticationFragment.flashWarning();
+            }
+        });
     }
 
     @Override
@@ -146,10 +163,18 @@ public class MainIntroActivity extends IntroActivity {
     public static class AuthenticationFragment extends SlideFragment {
         private Constants.EncryptionType encryptionType = Constants.EncryptionType.KEYSTORE;
 
+        private int slidePos = -1;
+
+        private int minLength = Constants.AUTH_MIN_PASSWORD_LENGTH;
+        private String lengthWarning = "";
+        private String noPasswordWarning = "";
+        private String confirmPasswordWarning = "";
+
         private TextView desc = null;
         private Spinner selection = null;
         private TextView authWarnings = null;
         private LinearLayout credentialsLayout = null;
+        private TextInputLayout passwordLayout = null;
         private TextInputEditText passwordInput = null;
         private EditText passwordConfirm = null;
 
@@ -158,6 +183,10 @@ public class MainIntroActivity extends IntroActivity {
         public AuthenticationFragment() {
         }
 
+        public void setSlidePos(int pos) {
+            slidePos = pos;
+        }
+
         public void updateEncryptionType(Constants.EncryptionType encryptionType) {
             this.encryptionType = encryptionType;
 
@@ -195,15 +224,28 @@ public class MainIntroActivity extends IntroActivity {
             authWarnings.setVisibility(View.GONE);
         }
 
+        public void flashWarning() {
+            if (authWarnings.getVisibility() == View.VISIBLE) {
+                ObjectAnimator animator = ObjectAnimator.ofInt(authWarnings, "backgroundColor",
+                        Color.TRANSPARENT, getResources().getColor(R.color.colorAccent), Color.TRANSPARENT);
+                animator.setDuration(500);
+                animator.setRepeatCount(0);
+                animator.setInterpolator(new AccelerateDecelerateInterpolator());
+                animator.setEvaluator(new ArgbEvaluator());
+                animator.start();
+            }
+        }
+
         @Override
         public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
-            View root = inflater.inflate(R.layout.component_intro_authentication, container, false);
+            final View root = inflater.inflate(R.layout.component_intro_authentication, container, false);
 
             desc = root.findViewById(R.id.introAuthDesc);
             selection = root.findViewById(R.id.introAuthSelection);
             authWarnings = root.findViewById(R.id.introAuthWarnings);
             credentialsLayout = root.findViewById(R.id.introCredentialsLayout);
+            passwordLayout = root.findViewById(R.id.introPasswordLayout);
             passwordInput = root.findViewById(R.id.introPasswordEdit);
             passwordConfirm = root.findViewById(R.id.introPasswordConfirm);
 
@@ -239,10 +281,52 @@ public class MainIntroActivity extends IntroActivity {
                 public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
                     Constants.AuthMethod authMethod = selectionMapping.get(i);
 
-                    if (authMethod == Constants.AuthMethod.PASSWORD || authMethod == Constants.AuthMethod.PIN) {
+                    if (authMethod == Constants.AuthMethod.PASSWORD) {
                         credentialsLayout.setVisibility(View.VISIBLE);
+
+                        passwordLayout.setHint(getString(R.string.settings_hint_password));
+                        passwordConfirm.setHint(R.string.settings_hint_password_confirm);
+
+                        passwordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                        passwordConfirm.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+
+                        passwordInput.setTransformationMethod(new PasswordTransformationMethod());
+                        passwordConfirm.setTransformationMethod(new PasswordTransformationMethod());
+
+                        minLength = Constants.AUTH_MIN_PASSWORD_LENGTH;
+                        lengthWarning = getString(R.string.settings_label_short_password, minLength);
+                        noPasswordWarning = getString(R.string.intro_slide3_warn_no_password);
+                        confirmPasswordWarning = getString(R.string.intro_slide3_warn_confirm_password);
+
+                        if (getIntroActivity().getCurrentSlidePosition() == slidePos) {
+                            passwordInput.requestFocus();
+                            UIHelper.showKeyboard(getContext(), passwordInput);
+                        }
+                    } else if (authMethod == Constants.AuthMethod.PIN) {
+                        credentialsLayout.setVisibility(View.VISIBLE);
+
+                        passwordLayout.setHint(getString(R.string.settings_hint_pin));
+                        passwordConfirm.setHint(R.string.settings_hint_pin_confirm);
+
+                        passwordInput.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+                        passwordConfirm.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+
+                        passwordInput.setTransformationMethod(new PasswordTransformationMethod());
+                        passwordConfirm.setTransformationMethod(new PasswordTransformationMethod());
+
+                        minLength = Constants.AUTH_MIN_PIN_LENGTH;
+                        lengthWarning = getString(R.string.settings_label_short_pin, minLength);
+                        noPasswordWarning = getString(R.string.intro_slide3_warn_no_pin);
+                        confirmPasswordWarning = getString(R.string.intro_slide3_warn_confirm_pin);
+
+                        if (getIntroActivity().getCurrentSlidePosition() == slidePos) {
+                            passwordInput.requestFocus();
+                            UIHelper.showKeyboard(getContext(), passwordInput);
+                        }
                     } else {
                         credentialsLayout.setVisibility(View.INVISIBLE);
+
+                        UIHelper.hideKeyboard(getIntroActivity(), root);
                     }
 
                     updateNavigation();
@@ -282,7 +366,23 @@ public class MainIntroActivity extends IntroActivity {
                 String password = passwordInput.getText().toString();
                 String confirm = passwordConfirm.getText().toString();
 
-                return ! password.isEmpty() && ! confirm.isEmpty() && confirm.equals(password);
+                if (! password.isEmpty()) {
+                    if (password.length() < minLength) {
+                        displayWarning(lengthWarning);
+                        return false;
+                    } else {
+                        if (! confirm.isEmpty() && confirm.equals(password)) {
+                            hideWarning();
+                            return true;
+                        } else {
+                            displayWarning(confirmPasswordWarning);
+                            return false;
+                        }
+                    }
+                } else {
+                    displayWarning(noPasswordWarning);
+                    return false;
+                }
             } else if (authMethod == Constants.AuthMethod.DEVICE) {
                 KeyguardManager km = (KeyguardManager) getContext().getSystemService(KEYGUARD_SERVICE);
 
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
index 5a02dd98..be3b30f4 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
@@ -44,7 +44,6 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.AdapterView;
@@ -103,42 +102,8 @@ public class MainActivity extends BaseActivity
                 .initiateScan();
     }
 
-    /*private void showFirstTimeWarning() {
-        ViewGroup container = findViewById(R.id.main_content);
-        View msgView = getLayoutInflater().inflate(R.layout.dialog_database_encryption, container, false);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.dialog_title_encryption)
-                .setView(msgView)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        settings.setFirstTimeWarningShown(true);
-                        updateEncryption(null);
-                    }
-                })
-                .setNegativeButton(R.string.button_settings, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        settings.setFirstTimeWarningShown(true);
-
-                        Intent settingsIntent = new Intent(getBaseContext(), SettingsActivity.class);
-                        startActivityForResult(settingsIntent, Constants.INTENT_MAIN_SETTINGS);
-                    }
-                })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialogInterface) {
-                        settings.setFirstTimeWarningShown(true);
-                        updateEncryption(null);
-                    }
-                })
-                .create()
-                .show();
-    }*/
-
     private void showFirstTimeWarning() {
-        Intent introIntent = new Intent(this, MainIntroActivity.class);
+        Intent introIntent = new Intent(this, IntroScreenActivity.class);
         startActivityForResult(introIntent, Constants.INTENT_MAIN_INTRO);
     }
 
diff --git a/app/src/main/res/layout/component_intro_authentication.xml b/app/src/main/res/layout/component_intro_authentication.xml
index 5f0d65f8..4a06732a 100644
--- a/app/src/main/res/layout/component_intro_authentication.xml
+++ b/app/src/main/res/layout/component_intro_authentication.xml
@@ -39,10 +39,12 @@
 
         <TextView
             android:id="@+id/introAuthWarnings"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_margin"
+            android:padding="@dimen/activity_margin_small"
             android:visibility="gone"
+            android:textColor="@color/warning_red"
             android:textAlignment="center"
             android:textStyle="bold" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9bcf5cef..b6cae957 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,6 +11,8 @@
     <color name="paypal_dark">#003087</color>
     <color name="paypal_light">#009cde</color>
 
+    <color name="warning_red">#b71c1c</color>                   <!-- material_red_900 -->
+
     <color name="dark_thumbnail_background">#ffe0e0e0</color>   <!-- material_grey_300 -->
 
     <color name="fab_small_label_background">#212121</color>
diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml
index 00028d49..be84c295 100644
--- a/app/src/main/res/values/strings_intro.xml
+++ b/app/src/main/res/values/strings_intro.xml
@@ -24,4 +24,8 @@
     <string name="intro_slide3_desc_password">Here you can setup an authentication to lock andOTP.
         Since you have chosen <b>Password / PIN</b> as encryption method you need to set either a
         password or a PIN to proceed.</string>
+    <string name="intro_slide3_warn_no_password">Please set a password to continue!</string>
+    <string name="intro_slide3_warn_no_pin">Please set a PIN to continue!</string>
+    <string name="intro_slide3_warn_confirm_password">Please confirm your password to continue!</string>
+    <string name="intro_slide3_warn_confirm_pin">Please confirm your PIN to continue!</string>
 </resources>
\ No newline at end of file