remove passphrase fragment from key creation
This commit is contained in:
Vincent Breitmoser
@@ -62,6 +62,7 @@ public class CreateKeyActivityTest {
|
|||||||
|
|
||||||
//@Test
|
//@Test
|
||||||
public void testCreateMyKey() {
|
public void testCreateMyKey() {
|
||||||
|
/*
|
||||||
|
|
||||||
mActivity.getActivity();
|
mActivity.getActivity();
|
||||||
|
|
||||||
@@ -198,6 +199,7 @@ public class CreateKeyActivityTest {
|
|||||||
// Clicks create key
|
// Clicks create key
|
||||||
onView(withId(R.id.create_key_next_button))
|
onView(withId(R.id.create_key_next_button))
|
||||||
.perform(click());
|
.perform(click());
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ public class CreateKeyEmailFragment extends Fragment {
|
|||||||
CreateSecurityTokenPinFragment frag = CreateSecurityTokenPinFragment.newInstance();
|
CreateSecurityTokenPinFragment frag = CreateSecurityTokenPinFragment.newInstance();
|
||||||
mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
|
mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
|
||||||
} else {
|
} else {
|
||||||
CreateKeyPassphraseFragment frag = CreateKeyPassphraseFragment.newInstance();
|
CreateKeyFinalFragment frag = CreateKeyFinalFragment.newInstance();
|
||||||
mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
|
mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,211 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 Schürmann & Breitmoser GbR
|
|
||||||
*
|
|
||||||
* 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.sufficientlysecure.keychain.ui;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.text.Editable;
|
|
||||||
import android.text.TextWatcher;
|
|
||||||
import android.text.method.HideReturnsTransformationMethod;
|
|
||||||
import android.text.method.PasswordTransformationMethod;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.inputmethod.InputMethodManager;
|
|
||||||
import android.widget.CheckBox;
|
|
||||||
import android.widget.CompoundButton;
|
|
||||||
import android.widget.EditText;
|
|
||||||
|
|
||||||
import org.sufficientlysecure.keychain.R;
|
|
||||||
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.PassphraseEditText;
|
|
||||||
import org.sufficientlysecure.keychain.util.Passphrase;
|
|
||||||
|
|
||||||
public class CreateKeyPassphraseFragment extends Fragment {
|
|
||||||
|
|
||||||
// view
|
|
||||||
CreateKeyActivity mCreateKeyActivity;
|
|
||||||
PassphraseEditText mPassphraseEdit;
|
|
||||||
EditText mPassphraseEditAgain;
|
|
||||||
CheckBox mShowPassphrase;
|
|
||||||
View mBackButton;
|
|
||||||
View mNextButton;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates new instance of this fragment
|
|
||||||
*/
|
|
||||||
public static CreateKeyPassphraseFragment newInstance() {
|
|
||||||
CreateKeyPassphraseFragment frag = new CreateKeyPassphraseFragment();
|
|
||||||
|
|
||||||
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.
|
|
||||||
*
|
|
||||||
* @param context
|
|
||||||
* @param editText
|
|
||||||
* @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_key_passphrase_fragment, container, false);
|
|
||||||
|
|
||||||
mPassphraseEdit = view.findViewById(R.id.create_key_passphrase);
|
|
||||||
mPassphraseEditAgain = view.findViewById(R.id.create_key_passphrase_again);
|
|
||||||
mShowPassphrase = view.findViewById(R.id.create_key_show_passphrase);
|
|
||||||
mBackButton = view.findViewById(R.id.create_key_back_button);
|
|
||||||
mNextButton = view.findViewById(R.id.create_key_next_button);
|
|
||||||
|
|
||||||
// initial values
|
|
||||||
// TODO: using String here is unsafe...
|
|
||||||
if (mCreateKeyActivity.mPassphrase != null) {
|
|
||||||
mPassphraseEdit.setText(mCreateKeyActivity.mPassphrase.toStringUnsafe());
|
|
||||||
mPassphraseEditAgain.setText(mCreateKeyActivity.mPassphrase.toStringUnsafe());
|
|
||||||
}
|
|
||||||
|
|
||||||
mPassphraseEdit.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();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
mShowPassphrase.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
|
||||||
if (isChecked) {
|
|
||||||
mPassphraseEdit.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
|
|
||||||
mPassphraseEditAgain.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
|
|
||||||
} else {
|
|
||||||
mPassphraseEdit.setTransformationMethod(PasswordTransformationMethod.getInstance());
|
|
||||||
mPassphraseEditAgain.setTransformationMethod(PasswordTransformationMethod.getInstance());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
TextWatcher textWatcher = new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
||||||
if (!isEditTextNotEmpty(getActivity(), mPassphraseEdit)) {
|
|
||||||
mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) {
|
|
||||||
mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_ok, 0);
|
|
||||||
} else {
|
|
||||||
mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_bad, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
mPassphraseEdit.addTextChangedListener(textWatcher);
|
|
||||||
mPassphraseEditAgain.addTextChangedListener(textWatcher);
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAttach(Context context) {
|
|
||||||
super.onAttach(context);
|
|
||||||
mCreateKeyActivity = (CreateKeyActivity) getActivity();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void back() {
|
|
||||||
hideKeyboard();
|
|
||||||
mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void nextClicked() {
|
|
||||||
if (isEditTextNotEmpty(getActivity(), mPassphraseEdit)) {
|
|
||||||
|
|
||||||
if (!areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) {
|
|
||||||
mPassphraseEditAgain.setError(getActivity().getApplicationContext().getString(R.string.create_key_passphrases_not_equal));
|
|
||||||
mPassphraseEditAgain.requestFocus();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mPassphraseEditAgain.setError(null);
|
|
||||||
// save state
|
|
||||||
mCreateKeyActivity.mPassphrase = new Passphrase(mPassphraseEdit);
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user