From 703e0b34e7fb0720dfb601ed3faf5fc2918107db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 16 Oct 2015 13:11:28 +0200 Subject: Prevent nfc dialog from closing when touching outside of it, add cancel button --- .../keychain/ui/CreateKeyEmailFragment.java | 2 +- .../keychain/ui/CreateYubiKeyPinFragment.java | 213 +++++++++++++++++++++ .../ui/CreateYubiKeyPinRepeatFragment.java | 213 --------------------- .../keychain/ui/NfcOperationActivity.java | 12 +- .../res/layout/create_yubi_key_pin_fragment.xml | 130 +++++++++++++ .../layout/create_yubi_key_pin_repeat_fragment.xml | 130 ------------- .../src/main/res/layout/nfc_operation_activity.xml | 12 +- 7 files changed, 366 insertions(+), 346 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinRepeatFragment.java create mode 100644 OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml delete mode 100644 OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java index 8f2fb97dd..acb768f55 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java @@ -238,7 +238,7 @@ public class CreateKeyEmailFragment extends Fragment { if (createKeyActivity.mCreateYubiKey) { hideKeyboard(); - CreateYubiKeyPinRepeatFragment frag = CreateYubiKeyPinRepeatFragment.newInstance(); + CreateYubiKeyPinFragment frag = CreateYubiKeyPinFragment.newInstance(); mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT); } else { CreateKeyPassphraseFragment frag = CreateKeyPassphraseFragment.newInstance(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java new file mode 100644 index 000000000..128383d6d --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2015 Dominik Schürmann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui; + +import android.app.Activity; +import android.content.Context; +import android.os.AsyncTask; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; +import android.widget.TextView; + +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction; +import org.sufficientlysecure.keychain.util.Passphrase; + +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.HashSet; + +public class CreateYubiKeyPinFragment extends Fragment { + + // view + CreateKeyActivity mCreateKeyActivity; + EditText mPin; + EditText mPinRepeat; + TextView mAdminPin; + View mBackButton; + View mNextButton; + + private static HashSet sPinBlacklist = new HashSet<>(Arrays.asList( + "000000", + "111111", + "222222", + "333333", + "444444", + "555555", + "666666", + "777777", + "888888", + "999999", + "123456", + "XXXXXX" + )); + + /** + * Creates new instance of this fragment + */ + public static CreateYubiKeyPinFragment newInstance() { + CreateYubiKeyPinFragment frag = new CreateYubiKeyPinFragment(); + + Bundle args = new Bundle(); + frag.setArguments(args); + + return frag; + } + + /** + * Checks if text of given EditText is not empty. If it is empty an error is + * set and the EditText gets the focus. + * + * @return true if EditText is not empty + */ + private static boolean isEditTextNotEmpty(Context context, EditText editText) { + boolean output = true; + if (editText.getText().length() == 0) { + editText.setError(context.getString(R.string.create_key_empty)); + editText.requestFocus(); + output = false; + } else { + editText.setError(null); + } + + return output; + } + + private static boolean areEditTextsEqual(EditText editText1, EditText editText2) { + Passphrase p1 = new Passphrase(editText1); + Passphrase p2 = new Passphrase(editText2); + return (p1.equals(p2)); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.create_yubi_key_pin_fragment, container, false); + + mPin = (EditText) view.findViewById(R.id.create_yubi_key_pin); + mPinRepeat = (EditText) view.findViewById(R.id.create_yubi_key_pin_repeat); + mAdminPin = (TextView) view.findViewById(R.id.create_yubi_key_admin_pin); + mBackButton = view.findViewById(R.id.create_key_back_button); + mNextButton = view.findViewById(R.id.create_key_next_button); + + if (mCreateKeyActivity.mYubiKeyPin == null) { + new AsyncTask() { + @Override + protected Passphrase doInBackground(Void... unused) { + SecureRandom secureRandom = new SecureRandom(); + // min = 8, we choose 8 + String adminPin = "" + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9) + + secureRandom.nextInt(9); + + return new Passphrase(adminPin); + } + + @Override + protected void onPostExecute(Passphrase adminPin) { + mCreateKeyActivity.mYubiKeyAdminPin = adminPin; + + mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe()); + } + }.execute(); + } else { + mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe()); + } + + mPin.requestFocus(); + mBackButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + back(); + } + }); + mNextButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + nextClicked(); + } + }); + + return view; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + mCreateKeyActivity = (CreateKeyActivity) getActivity(); + } + + private void back() { + hideKeyboard(); + mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT); + } + + private void nextClicked() { + if (isEditTextNotEmpty(getActivity(), mPin)) { + + if (!areEditTextsEqual(mPin, mPinRepeat)) { + mPinRepeat.setError(getString(R.string.create_key_passphrases_not_equal)); + mPinRepeat.requestFocus(); + return; + } + + if (mPin.getText().toString().length() < 6) { + mPin.setError(getString(R.string.create_key_yubi_key_pin_too_short)); + mPin.requestFocus(); + return; + } + + if (sPinBlacklist.contains(mPin.getText().toString())) { + mPin.setError(getString(R.string.create_key_yubi_key_pin_insecure)); + mPin.requestFocus(); + return; + } + + mCreateKeyActivity.mYubiKeyPin = new Passphrase(mPin.getText().toString()); + + CreateKeyFinalFragment frag = CreateKeyFinalFragment.newInstance(); + hideKeyboard(); + mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT); + } + } + + private void hideKeyboard() { + if (getActivity() == null) { + return; + } + InputMethodManager inputManager = (InputMethodManager) getActivity() + .getSystemService(Context.INPUT_METHOD_SERVICE); + + // check if no view has focus + View v = getActivity().getCurrentFocus(); + if (v == null) + return; + + inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0); + } + +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinRepeatFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinRepeatFragment.java deleted file mode 100644 index f3f226232..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinRepeatFragment.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (C) 2015 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui; - -import android.app.Activity; -import android.content.Context; -import android.os.AsyncTask; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -import android.widget.TextView; - -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction; -import org.sufficientlysecure.keychain.util.Passphrase; - -import java.security.SecureRandom; -import java.util.Arrays; -import java.util.HashSet; - -public class CreateYubiKeyPinRepeatFragment extends Fragment { - - // view - CreateKeyActivity mCreateKeyActivity; - EditText mPin; - EditText mPinRepeat; - TextView mAdminPin; - View mBackButton; - View mNextButton; - - private static HashSet sPinBlacklist = new HashSet<>(Arrays.asList( - "000000", - "111111", - "222222", - "333333", - "444444", - "555555", - "666666", - "777777", - "888888", - "999999", - "123456", - "XXXXXX" - )); - - /** - * Creates new instance of this fragment - */ - public static CreateYubiKeyPinRepeatFragment newInstance() { - CreateYubiKeyPinRepeatFragment frag = new CreateYubiKeyPinRepeatFragment(); - - Bundle args = new Bundle(); - frag.setArguments(args); - - return frag; - } - - /** - * Checks if text of given EditText is not empty. If it is empty an error is - * set and the EditText gets the focus. - * - * @return true if EditText is not empty - */ - private static boolean isEditTextNotEmpty(Context context, EditText editText) { - boolean output = true; - if (editText.getText().length() == 0) { - editText.setError(context.getString(R.string.create_key_empty)); - editText.requestFocus(); - output = false; - } else { - editText.setError(null); - } - - return output; - } - - private static boolean areEditTextsEqual(EditText editText1, EditText editText2) { - Passphrase p1 = new Passphrase(editText1); - Passphrase p2 = new Passphrase(editText2); - return (p1.equals(p2)); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.create_yubi_key_pin_repeat_fragment, container, false); - - mPin = (EditText) view.findViewById(R.id.create_yubi_key_pin); - mPinRepeat = (EditText) view.findViewById(R.id.create_yubi_key_pin_repeat); - mAdminPin = (TextView) view.findViewById(R.id.create_yubi_key_admin_pin); - mBackButton = view.findViewById(R.id.create_key_back_button); - mNextButton = view.findViewById(R.id.create_key_next_button); - - if (mCreateKeyActivity.mYubiKeyPin == null) { - new AsyncTask() { - @Override - protected Passphrase doInBackground(Void... unused) { - SecureRandom secureRandom = new SecureRandom(); - // min = 8, we choose 8 - String adminPin = "" + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9) - + secureRandom.nextInt(9); - - return new Passphrase(adminPin); - } - - @Override - protected void onPostExecute(Passphrase adminPin) { - mCreateKeyActivity.mYubiKeyAdminPin = adminPin; - - mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe()); - } - }.execute(); - } else { - mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe()); - } - - mPin.requestFocus(); - mBackButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - back(); - } - }); - mNextButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - nextClicked(); - } - }); - - return view; - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - mCreateKeyActivity = (CreateKeyActivity) getActivity(); - } - - private void back() { - hideKeyboard(); - mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT); - } - - private void nextClicked() { - if (isEditTextNotEmpty(getActivity(), mPin)) { - - if (!areEditTextsEqual(mPin, mPinRepeat)) { - mPinRepeat.setError(getString(R.string.create_key_passphrases_not_equal)); - mPinRepeat.requestFocus(); - return; - } - - if (mPin.getText().toString().length() < 6) { - mPin.setError(getString(R.string.create_key_yubi_key_pin_too_short)); - mPin.requestFocus(); - return; - } - - if (sPinBlacklist.contains(mPin.getText().toString())) { - mPin.setError(getString(R.string.create_key_yubi_key_pin_insecure)); - mPin.requestFocus(); - return; - } - - mCreateKeyActivity.mYubiKeyPin = new Passphrase(mPin.getText().toString()); - - CreateKeyFinalFragment frag = CreateKeyFinalFragment.newInstance(); - hideKeyboard(); - mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT); - } - } - - private void hideKeyboard() { - if (getActivity() == null) { - return; - } - InputMethodManager inputManager = (InputMethodManager) getActivity() - .getSystemService(Context.INPUT_METHOD_SERVICE); - - // check if no view has focus - View v = getActivity().getCurrentFocus(); - if (v == null) - return; - - inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0); - } - -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java index 7a2313e0f..af20ddc84 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java @@ -92,7 +92,9 @@ public class NfcOperationActivity extends BaseNfcActivity { // prevent annoying orientation changes while fumbling with the device OrientationUtils.lockOrientation(this); - + // prevent close when touching outside of the dialog (happens easily when fumbling with the device) + setFinishOnTouchOutside(false); + // keep screen on getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); mInputParcel = getIntent().getParcelableExtra(EXTRA_CRYPTO_INPUT); @@ -115,6 +117,14 @@ public class NfcOperationActivity extends BaseNfcActivity { vAnimator.setDisplayedChild(0); } }); + Button vCancel = (Button) findViewById(R.id.nfc_activity_0_cancel); + vCancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + setResult(RESULT_CANCELED); + finish(); + } + }); Intent intent = getIntent(); Bundle data = intent.getExtras(); diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml new file mode 100644 index 000000000..c3b73d91f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml deleted file mode 100644 index c3b73d91f..000000000 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml index 9a9738825..30d5013dc 100644 --- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml @@ -14,7 +14,7 @@ android:measureAllChildren="false" android:minHeight="?listPreferredItemHeightSmall" android:outAnimation="@anim/fade_out" - custom:initialView="3"> + custom:initialView="0"> + +