aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java105
1 files changed, 42 insertions, 63 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java
index 483a5f4e5..63549c3d6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiFragment.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
@@ -38,11 +36,9 @@ import android.support.v4.content.Loader;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.EditText;
import android.widget.TextView;
import android.widget.ViewAnimator;
-import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
@@ -51,57 +47,59 @@ import org.sufficientlysecure.keychain.operations.results.PromoteKeyResult;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
-import org.sufficientlysecure.keychain.service.KeychainIntentService.IOType;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.NfcListenerFragment;
-import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import org.sufficientlysecure.keychain.ui.widget.NameEditText;
-import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences;
-public class CreateKeyYubiFragment extends Fragment implements NfcListenerFragment,
- LoaderManager.LoaderCallbacks<Cursor> {
+public class CreateKeyYubiFragment extends Fragment
+ implements LoaderManager.LoaderCallbacks<Cursor> {
+
+ private static final String ARG_FINGERPRINT = "fingerprint";
CreateKeyActivity mCreateKeyActivity;
- NameEditText mNameEdit;
- View mBackButton;
- View mNextButton;
- private TextView mUnknownFingerprint;
- public static final String ARGS_MASTER_KEY_ID = "master_key_id";
private byte[] mScannedFingerprint;
private long mScannedMasterKeyId;
+
private ViewAnimator mAnimator;
+ private TextView mUnknownFingerprint;
private TextView mFingerprint;
private TextView mUserId;
- private YubiImportState mState = YubiImportState.SCAN;
+ private YubiImportState mState;
+
+ public static Fragment createInstance(byte[] scannedFingerprint) {
+ Bundle args = new Bundle();
+ args.putByteArray(ARG_FINGERPRINT, scannedFingerprint);
+
+ CreateKeyYubiFragment frag = new CreateKeyYubiFragment();
+ frag.setArguments(args);
+
+ return frag;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ mScannedFingerprint = getArguments().getByteArray(ARG_FINGERPRINT);
+ mScannedMasterKeyId = getKeyIdFromFingerprint(mScannedFingerprint);
+
+ getLoaderManager().initLoader(0, null, this);
+ }
enum YubiImportState {
- SCAN, // waiting for scan
UNKNOWN, // scanned unknown key (ready to import)
BAD_FINGERPRINT, // scanned key, bad fingerprint
IMPORTED, // imported key (ready to promote)
}
- 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;
- }
-
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.create_yubikey_fragment, container, false);
@@ -113,8 +111,8 @@ public class CreateKeyYubiFragment extends Fragment implements NfcListenerFragme
mFingerprint = (TextView) view.findViewById(R.id.create_yubikey_fingerprint);
mUserId = (TextView) view.findViewById(R.id.create_yubikey_user_id);
- mBackButton = view.findViewById(R.id.create_key_back_button);
- mNextButton = view.findViewById(R.id.create_key_next_button);
+ View mBackButton = view.findViewById(R.id.create_key_back_button);
+ View mNextButton = view.findViewById(R.id.create_key_next_button);
mBackButton.setOnClickListener(new View.OnClickListener() {
@Override
@@ -138,16 +136,6 @@ public class CreateKeyYubiFragment extends Fragment implements NfcListenerFragme
mCreateKeyActivity = (CreateKeyActivity) getActivity();
}
- @Override
- public void onNfcPerform() throws IOException {
-
- mScannedFingerprint = mCreateKeyActivity.nfcGetFingerprint(0);
- mScannedMasterKeyId = getKeyIdFromFingerprint(mScannedFingerprint);
-
- getLoaderManager().initLoader(0, null, this);
-
- }
-
// These are the rows that we will retrieve.
static final String[] UNIFIED_PROJECTION = new String[]{
KeychainContract.KeyRings._ID,
@@ -185,35 +173,26 @@ public class CreateKeyYubiFragment extends Fragment implements NfcListenerFragme
return;
}
- showKey(data);
+ String userId = data.getString(INDEX_USER_ID);
+ boolean hasSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
- } else {
- showUnknownKey();
- }
- }
+ String fp = KeyFormattingUtils.convertFingerprintToHex(mScannedFingerprint);
+ mFingerprint.setText(KeyFormattingUtils.colorizeFingerprint(fp));
- public void showUnknownKey() {
- String fp = KeyFormattingUtils.convertFingerprintToHex(mScannedFingerprint);
- mUnknownFingerprint.setText(KeyFormattingUtils.colorizeFingerprint(fp));
-
- mAnimator.setDisplayedChild(1);
- mState = YubiImportState.UNKNOWN;
- }
+ mUserId.setText(userId);
- public void showKey(Cursor data) {
- String userId = data.getString(INDEX_USER_ID);
- boolean hasSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
+ mAnimator.setDisplayedChild(2);
+ mState = YubiImportState.IMPORTED;
- String fp = KeyFormattingUtils.convertFingerprintToHex(mScannedFingerprint);
- mFingerprint.setText(KeyFormattingUtils.colorizeFingerprint(fp));
-
- mUserId.setText(userId);
+ } else {
+ String fp = KeyFormattingUtils.convertFingerprintToHex(mScannedFingerprint);
+ mUnknownFingerprint.setText(KeyFormattingUtils.colorizeFingerprint(fp));
- mAnimator.setDisplayedChild(2);
- mState = YubiImportState.IMPORTED;
+ mAnimator.setDisplayedChild(1);
+ mState = YubiImportState.UNKNOWN;
+ }
}
-
private void nextClicked() {
switch (mState) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 06:59:12 +0000