From fb2a8624a42fa30215a4e2ca813a0fc59b22fecf Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 5 Sep 2017 19:06:38 +0200 Subject: [PATCH] token-import: remove old import/reset fragment --- .../keychain/ui/CreateKeyActivity.java | 27 +- ...reateSecurityTokenImportResetFragment.java | 276 ------------------ .../ui/base/BaseSecurityTokenActivity.java | 29 +- 3 files changed, 15 insertions(+), 317 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index 25c0efcb7..978d7b8e4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -57,6 +57,7 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity { public static final String EXTRA_SECURITY_TOKEN_USER_ID = "nfc_user_id"; public static final String EXTRA_SECURITY_TOKEN_AID = "nfc_aid"; public static final String EXTRA_SECURITY_FINGERPRINTS = "nfc_fingerprints"; + public static final String EXTRA_SECURITY_TOKEN_URL = "nfc_url"; public static final String FRAGMENT_TAG = "currentFragment"; @@ -123,10 +124,11 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity { byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_SECURITY_FINGERPRINTS); String nfcUserId = intent.getStringExtra(EXTRA_SECURITY_TOKEN_USER_ID); byte[] nfcAid = intent.getByteArrayExtra(EXTRA_SECURITY_TOKEN_AID); + String nfcUrl = intent.getStringExtra(EXTRA_SECURITY_TOKEN_URL); if (containsKeys(nfcFingerprints)) { - Fragment frag = CreateSecurityTokenImportResetFragment.newInstance( - nfcFingerprints, nfcAid, nfcUserId); + Fragment frag = ManageSecurityTokenFragment.newInstance( + nfcFingerprints, nfcAid, nfcUserId, nfcUrl); loadFragment(frag, FragAction.START); setTitle(R.string.title_import_keys); @@ -183,24 +185,9 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity { } if (containsKeys(mScannedFingerprints)) { - try { - long masterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mScannedFingerprints); - CachedPublicKeyRing ring = KeyRepository.createDatabaseInteractor(this).getCachedPublicKeyRing(masterKeyId); - ring.getMasterKeyId(); - - Intent intent = new Intent(this, ViewKeyActivity.class); - intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId)); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mSecurityTokenAid); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mSecurityTokenUserId); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mScannedFingerprints); - startActivity(intent); - finish(); - - } catch (PgpKeyNotFoundException e) { - Fragment frag = ManageSecurityTokenFragment.newInstance( - mScannedFingerprints, mSecurityTokenAid, mSecurityTokenUserId, mSecurityTokenUrl); - loadFragment(frag, FragAction.TO_RIGHT); - } + Fragment frag = ManageSecurityTokenFragment.newInstance( + mScannedFingerprints, mSecurityTokenAid, mSecurityTokenUserId, mSecurityTokenUrl); + loadFragment(frag, FragAction.TO_RIGHT); } else { Fragment frag = CreateSecurityTokenBlankFragment.newInstance(mSecurityTokenAid); loadFragment(frag, FragAction.TO_RIGHT); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java deleted file mode 100644 index 2822bbe6a..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright (C) 2014 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.content.Intent; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.RadioButton; -import android.widget.TextView; - -import org.bouncycastle.util.encoders.Hex; -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; -import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; -import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; -import org.sufficientlysecure.keychain.securitytoken.SecurityTokenHelper; -import org.sufficientlysecure.keychain.service.ImportKeyringParcel; -import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; -import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; -import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction; -import org.sufficientlysecure.keychain.ui.CreateKeyActivity.SecurityTokenListenerFragment; -import org.sufficientlysecure.keychain.ui.base.QueueingCryptoOperationFragment; -import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity; -import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; - - -public class CreateSecurityTokenImportResetFragment - extends QueueingCryptoOperationFragment - implements SecurityTokenListenerFragment { - - private static final int REQUEST_CODE_RESET = 0x00005001; - - private static final String ARG_FINGERPRINTS = "fingerprint"; - public static final String ARG_AID = "aid"; - public static final String ARG_USER_ID = "user_ids"; - - CreateKeyActivity mCreateKeyActivity; - - private byte[] mTokenFingerprints; - private byte[] mTokenAid; - private double mTokenVersion; - private String mTokenUserId; - private byte[] mTokenFingerprint; - private TextView vSerNo; - private TextView vUserId; - private TextView mNextButton; - private RadioButton mRadioImport; - private RadioButton mRadioReset; - private View mResetWarning; - - // for CryptoOperationFragment key import - private HkpKeyserverAddress mKeyserver; - private ArrayList mKeyList; - - public static Fragment newInstance(byte[] scannedFingerprints, byte[] nfcAid, String userId) { - - CreateSecurityTokenImportResetFragment frag = new CreateSecurityTokenImportResetFragment(); - - Bundle args = new Bundle(); - args.putByteArray(ARG_FINGERPRINTS, scannedFingerprints); - args.putByteArray(ARG_AID, nfcAid); - args.putString(ARG_USER_ID, userId); - frag.setArguments(args); - - return frag; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle args = savedInstanceState != null ? savedInstanceState : getArguments(); - - mTokenFingerprints = args.getByteArray(ARG_FINGERPRINTS); - mTokenAid = args.getByteArray(ARG_AID); - mTokenUserId = args.getString(ARG_USER_ID); - - byte[] fp = new byte[20]; - ByteBuffer.wrap(fp).put(mTokenFingerprints, 0, 20); - mTokenFingerprint = fp; - - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.create_security_token_import_reset_fragment, container, false); - - vSerNo = (TextView) view.findViewById(R.id.token_serno); - vUserId = (TextView) view.findViewById(R.id.token_userid); - mNextButton = (TextView) view.findViewById(R.id.create_key_next_button); - mRadioImport = (RadioButton) view.findViewById(R.id.token_decision_import); - mRadioReset = (RadioButton) view.findViewById(R.id.token_decision_reset); - mResetWarning = view.findViewById(R.id.token_import_reset_warning); - - View mBackButton = view.findViewById(R.id.create_key_back_button); - mBackButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (getFragmentManager().getBackStackEntryCount() == 0) { - getActivity().setResult(Activity.RESULT_CANCELED); - getActivity().finish(); - } else { - mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT); - } - } - }); - - mNextButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mRadioReset.isChecked()) { - resetCard(); - } else if (mRadioImport.isChecked()){ - importKey(); - } - } - }); - - mRadioImport.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - mNextButton.setText(R.string.btn_import); - mNextButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_key_plus_grey600_24dp, 0); - mNextButton.setVisibility(View.VISIBLE); - mResetWarning.setVisibility(View.GONE); - } - } - }); - mRadioReset.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - mNextButton.setText(R.string.btn_reset); - mNextButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_close_grey_24dp, 0); - mNextButton.setVisibility(View.VISIBLE); - mResetWarning.setVisibility(View.VISIBLE); - } - } - }); - - setData(); - - return view; - } - - @Override - public void onSaveInstanceState(Bundle args) { - super.onSaveInstanceState(args); - - args.putByteArray(ARG_FINGERPRINTS, mTokenFingerprints); - args.putByteArray(ARG_AID, mTokenAid); - args.putString(ARG_USER_ID, mTokenUserId); - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - mCreateKeyActivity = (CreateKeyActivity) getActivity(); - } - - public void setData() { - String serno = Hex.toHexString(mTokenAid, 10, 4); - vSerNo.setText(getString(R.string.security_token_serial_no, serno)); - - if (!mTokenUserId.isEmpty()) { - vUserId.setText(getString(R.string.security_token_key_holder, mTokenUserId)); - } else { - vUserId.setText(getString(R.string.security_token_key_holder_not_set)); - } - } - - public void importKey() { -// Fragment frag = CreateSecurityTokenImportFragment.newInstance(mTokenFingerprints, mTokenAid, mTokenUserId, -// keyUdi); -// mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT); - } - - public void resetCard() { - Intent intent = new Intent(getActivity(), SecurityTokenOperationActivity.class); - RequiredInputParcel resetP = RequiredInputParcel.createSecurityTokenReset(); - intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, resetP); - intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, CryptoInputParcel.createCryptoInputParcel()); - startActivityForResult(intent, REQUEST_CODE_RESET); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_CODE_RESET && resultCode == Activity.RESULT_OK) { - mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT); - return; - } - - super.onActivityResult(requestCode, resultCode, data); - } - - @Override - public void doSecurityTokenInBackground() throws IOException { - - mTokenFingerprints = mCreateKeyActivity.getSecurityTokenHelper().getFingerprints(); - mTokenAid = mCreateKeyActivity.getSecurityTokenHelper().getAid(); - mTokenVersion = SecurityTokenHelper.parseOpenPgpVersion(mTokenAid); - mTokenUserId = mCreateKeyActivity.getSecurityTokenHelper().getUserId(); - - byte[] fp = new byte[20]; - ByteBuffer.wrap(fp).put(mTokenFingerprints, 0, 20); - mTokenFingerprint = fp; - } - - @Override - public void onSecurityTokenPostExecute() { - - setData(); - - } - - @Override - public ImportKeyringParcel createOperationInput() { - return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver); - } - - @Override - public void onQueuedOperationSuccess(ImportKeyResult result) { - long[] masterKeyIds = result.getImportedMasterKeyIds(); - if (masterKeyIds.length == 0) { - super.onCryptoOperationError(result); - return; - } - - // null-protected from Queueing*Fragment - Activity activity = getActivity(); - - Intent viewKeyIntent = new Intent(activity, ViewKeyActivity.class); - // use the imported masterKeyId, not the one from the token, because - // that one might* just have been a subkey of the imported key - viewKeyIntent.setData(KeyRings.buildGenericKeyRingUri(masterKeyIds[0])); - viewKeyIntent.putExtra(ViewKeyActivity.EXTRA_DISPLAY_RESULT, result); - viewKeyIntent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mTokenAid); - viewKeyIntent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_VERSION, mTokenVersion); - viewKeyIntent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mTokenUserId); - viewKeyIntent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mTokenFingerprints); - - if (activity instanceof CreateKeyActivity) { - ((CreateKeyActivity) activity).finishWithFirstTimeHandling(viewKeyIntent); - } else { - activity.startActivity(viewKeyIntent); - activity.finish(); - } - } -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java index 55ed00358..4dfa045ca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java @@ -81,6 +81,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity private byte[] mSecurityTokenFingerprints; private String mSecurityTokenUserId; private byte[] mSecurityTokenAid; + private String mSecurityTokenUrl; /** * Override to change UI before SecurityToken handling (UI thread) @@ -95,33 +96,19 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity mSecurityTokenAid = mSecurityTokenHelper.getAid(); mSecurityTokenFingerprints = mSecurityTokenHelper.getFingerprints(); mSecurityTokenUserId = mSecurityTokenHelper.getUserId(); + mSecurityTokenUrl = mSecurityTokenHelper.getUrl(); } /** * Override to handle result of SecurityToken operations (UI thread) */ protected void onSecurityTokenPostExecute() { - - final long subKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mSecurityTokenFingerprints); - - try { - CachedPublicKeyRing ring = KeyRepository.createDatabaseInteractor(this).getCachedPublicKeyRing( - KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId)); - long masterKeyId = ring.getMasterKeyId(); - - Intent intent = new Intent(this, ViewKeyActivity.class); - intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId)); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mSecurityTokenAid); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mSecurityTokenUserId); - intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mSecurityTokenFingerprints); - startActivity(intent); - } catch (PgpKeyNotFoundException e) { - Intent intent = new Intent(this, CreateKeyActivity.class); - intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_TOKEN_AID, mSecurityTokenAid); - intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mSecurityTokenUserId); - intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_FINGERPRINTS, mSecurityTokenFingerprints); - startActivity(intent); - } + Intent intent = new Intent(this, CreateKeyActivity.class); + intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_FINGERPRINTS, mSecurityTokenFingerprints); + intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_TOKEN_AID, mSecurityTokenAid); + intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mSecurityTokenUserId); + intent.putExtra(CreateKeyActivity.EXTRA_SECURITY_TOKEN_URL, mSecurityTokenUrl); + startActivity(intent); } /**