679 lines
28 KiB
Java
679 lines
28 KiB
Java
/*
|
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
|
*
|
|
* 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.app.ProgressDialog;
|
|
import android.content.Intent;
|
|
import android.database.Cursor;
|
|
import android.net.Uri;
|
|
import android.os.Bundle;
|
|
import android.os.Handler;
|
|
import android.os.Message;
|
|
import android.os.Messenger;
|
|
import android.support.v4.app.LoaderManager;
|
|
import android.support.v4.content.CursorLoader;
|
|
import android.support.v4.content.Loader;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.View.OnClickListener;
|
|
import android.view.ViewGroup;
|
|
import android.widget.AdapterView;
|
|
import android.widget.ListView;
|
|
|
|
import org.sufficientlysecure.keychain.Constants;
|
|
import org.sufficientlysecure.keychain.R;
|
|
import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
|
|
import org.sufficientlysecure.keychain.operations.results.OperationResult;
|
|
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
|
|
import org.sufficientlysecure.keychain.operations.results.SingletonResult;
|
|
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
|
|
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
|
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
|
import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
|
|
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
|
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
|
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
|
import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
|
|
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
|
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
|
|
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
|
|
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
|
|
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyChange;
|
|
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
|
import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
|
|
import org.sufficientlysecure.keychain.ui.adapter.SubkeysAddedAdapter;
|
|
import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
|
|
import org.sufficientlysecure.keychain.ui.adapter.UserIdsAddedAdapter;
|
|
import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment;
|
|
import org.sufficientlysecure.keychain.ui.dialog.*;
|
|
import org.sufficientlysecure.keychain.ui.util.Notify;
|
|
import org.sufficientlysecure.keychain.util.Log;
|
|
import org.sufficientlysecure.keychain.util.Passphrase;
|
|
|
|
|
|
public class EditKeyFragment extends CryptoOperationFragment implements
|
|
LoaderManager.LoaderCallbacks<Cursor> {
|
|
|
|
public static final String ARG_DATA_URI = "uri";
|
|
public static final String ARG_SAVE_KEYRING_PARCEL = "save_keyring_parcel";
|
|
|
|
private ListView mUserIdsList;
|
|
private ListView mSubkeysList;
|
|
private ListView mUserIdsAddedList;
|
|
private ListView mSubkeysAddedList;
|
|
private View mChangePassphrase;
|
|
private View mAddUserId;
|
|
private View mAddSubkey;
|
|
|
|
private static final int LOADER_ID_USER_IDS = 0;
|
|
private static final int LOADER_ID_SUBKEYS = 1;
|
|
|
|
// cursor adapter
|
|
private UserIdsAdapter mUserIdsAdapter;
|
|
private SubkeysAdapter mSubkeysAdapter;
|
|
|
|
// array adapter
|
|
private UserIdsAddedAdapter mUserIdsAddedAdapter;
|
|
private SubkeysAddedAdapter mSubkeysAddedAdapter;
|
|
|
|
private Uri mDataUri;
|
|
|
|
private SaveKeyringParcel mSaveKeyringParcel;
|
|
|
|
private String mPrimaryUserId;
|
|
|
|
/**
|
|
* Creates new instance of this fragment
|
|
*/
|
|
public static EditKeyFragment newInstance(Uri dataUri) {
|
|
EditKeyFragment frag = new EditKeyFragment();
|
|
|
|
Bundle args = new Bundle();
|
|
args.putParcelable(ARG_DATA_URI, dataUri);
|
|
|
|
frag.setArguments(args);
|
|
|
|
return frag;
|
|
}
|
|
|
|
public static EditKeyFragment newInstance(SaveKeyringParcel saveKeyringParcel) {
|
|
EditKeyFragment frag = new EditKeyFragment();
|
|
|
|
Bundle args = new Bundle();
|
|
args.putParcelable(ARG_SAVE_KEYRING_PARCEL, saveKeyringParcel);
|
|
|
|
frag.setArguments(args);
|
|
|
|
return frag;
|
|
}
|
|
|
|
@Override
|
|
public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
|
|
View view = inflater.inflate(R.layout.edit_key_fragment, null);
|
|
|
|
mUserIdsList = (ListView) view.findViewById(R.id.edit_key_user_ids);
|
|
mSubkeysList = (ListView) view.findViewById(R.id.edit_key_keys);
|
|
mUserIdsAddedList = (ListView) view.findViewById(R.id.edit_key_user_ids_added);
|
|
mSubkeysAddedList = (ListView) view.findViewById(R.id.edit_key_subkeys_added);
|
|
mChangePassphrase = view.findViewById(R.id.edit_key_action_change_passphrase);
|
|
mAddUserId = view.findViewById(R.id.edit_key_action_add_user_id);
|
|
mAddSubkey = view.findViewById(R.id.edit_key_action_add_key);
|
|
|
|
return view;
|
|
}
|
|
|
|
@Override
|
|
public void onActivityCreated(Bundle savedInstanceState) {
|
|
super.onActivityCreated(savedInstanceState);
|
|
((EditKeyActivity) getActivity()).setFullScreenDialogDoneClose(
|
|
R.string.btn_save,
|
|
new OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
// if we are working on an Uri, save directly
|
|
if (mDataUri == null) {
|
|
returnKeyringParcel();
|
|
} else {
|
|
cryptoOperation(new CryptoInputParcel());
|
|
}
|
|
}
|
|
}, new OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
getActivity().setResult(Activity.RESULT_CANCELED);
|
|
getActivity().finish();
|
|
}
|
|
});
|
|
|
|
Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
|
|
SaveKeyringParcel saveKeyringParcel = getArguments().getParcelable(ARG_SAVE_KEYRING_PARCEL);
|
|
if (dataUri == null && saveKeyringParcel == null) {
|
|
Log.e(Constants.TAG, "Either a key Uri or ARG_SAVE_KEYRING_PARCEL is required!");
|
|
getActivity().finish();
|
|
return;
|
|
}
|
|
|
|
initView();
|
|
if (dataUri != null) {
|
|
loadData(dataUri);
|
|
} else {
|
|
loadSaveKeyringParcel(saveKeyringParcel);
|
|
}
|
|
}
|
|
|
|
private void loadSaveKeyringParcel(SaveKeyringParcel saveKeyringParcel) {
|
|
mSaveKeyringParcel = saveKeyringParcel;
|
|
mPrimaryUserId = saveKeyringParcel.mChangePrimaryUserId;
|
|
|
|
mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mSaveKeyringParcel.mAddUserIds, true);
|
|
mUserIdsAddedList.setAdapter(mUserIdsAddedAdapter);
|
|
|
|
mSubkeysAddedAdapter = new SubkeysAddedAdapter(getActivity(), mSaveKeyringParcel.mAddSubKeys, true);
|
|
mSubkeysAddedList.setAdapter(mSubkeysAddedAdapter);
|
|
}
|
|
|
|
private void loadData(Uri dataUri) {
|
|
mDataUri = dataUri;
|
|
|
|
Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
|
|
|
|
// load the secret key ring. we do verify here that the passphrase is correct, so cached won't do
|
|
try {
|
|
Uri secretUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(mDataUri);
|
|
CachedPublicKeyRing keyRing =
|
|
new ProviderHelper(getActivity()).getCachedPublicKeyRing(secretUri);
|
|
long masterKeyId = keyRing.getMasterKeyId();
|
|
|
|
// check if this is a master secret key we can work with
|
|
switch (keyRing.getSecretKeyType(masterKeyId)) {
|
|
case GNU_DUMMY:
|
|
finishWithError(LogType.MSG_EK_ERROR_DUMMY);
|
|
return;
|
|
}
|
|
|
|
mSaveKeyringParcel = new SaveKeyringParcel(masterKeyId, keyRing.getFingerprint());
|
|
mPrimaryUserId = keyRing.getPrimaryUserIdWithFallback();
|
|
|
|
} catch (PgpKeyNotFoundException | NotFoundException e) {
|
|
finishWithError(LogType.MSG_EK_ERROR_NOT_FOUND);
|
|
return;
|
|
}
|
|
|
|
// Prepare the loaders. Either re-connect with an existing ones,
|
|
// or start new ones.
|
|
getLoaderManager().initLoader(LOADER_ID_USER_IDS, null, EditKeyFragment.this);
|
|
getLoaderManager().initLoader(LOADER_ID_SUBKEYS, null, EditKeyFragment.this);
|
|
|
|
mUserIdsAdapter = new UserIdsAdapter(getActivity(), null, 0, mSaveKeyringParcel);
|
|
mUserIdsList.setAdapter(mUserIdsAdapter);
|
|
|
|
// TODO: SaveParcel from savedInstance?!
|
|
mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mSaveKeyringParcel.mAddUserIds, false);
|
|
mUserIdsAddedList.setAdapter(mUserIdsAddedAdapter);
|
|
|
|
mSubkeysAdapter = new SubkeysAdapter(getActivity(), null, 0, mSaveKeyringParcel);
|
|
mSubkeysList.setAdapter(mSubkeysAdapter);
|
|
|
|
mSubkeysAddedAdapter = new SubkeysAddedAdapter(getActivity(), mSaveKeyringParcel.mAddSubKeys, false);
|
|
mSubkeysAddedList.setAdapter(mSubkeysAddedAdapter);
|
|
}
|
|
|
|
private void initView() {
|
|
mChangePassphrase.setOnClickListener(new View.OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
changePassphrase();
|
|
}
|
|
});
|
|
|
|
mAddUserId.setOnClickListener(new View.OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
addUserId();
|
|
}
|
|
});
|
|
|
|
mAddSubkey.setOnClickListener(new OnClickListener() {
|
|
@Override
|
|
public void onClick(View v) {
|
|
addSubkey();
|
|
}
|
|
});
|
|
|
|
mSubkeysList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
@Override
|
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
editSubkey(position);
|
|
}
|
|
});
|
|
|
|
mUserIdsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
@Override
|
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
editUserId(position);
|
|
}
|
|
});
|
|
}
|
|
|
|
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
|
|
|
|
switch (id) {
|
|
case LOADER_ID_USER_IDS: {
|
|
Uri baseUri = UserPackets.buildUserIdsUri(mDataUri);
|
|
return new CursorLoader(getActivity(), baseUri,
|
|
UserIdsAdapter.USER_IDS_PROJECTION, null, null, null);
|
|
}
|
|
|
|
case LOADER_ID_SUBKEYS: {
|
|
Uri baseUri = KeychainContract.Keys.buildKeysUri(mDataUri);
|
|
return new CursorLoader(getActivity(), baseUri,
|
|
SubkeysAdapter.SUBKEYS_PROJECTION, null, null, null);
|
|
}
|
|
|
|
default:
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
|
|
// Swap the new cursor in. (The framework will take care of closing the
|
|
// old cursor once we return.)
|
|
switch (loader.getId()) {
|
|
case LOADER_ID_USER_IDS:
|
|
mUserIdsAdapter.swapCursor(data);
|
|
break;
|
|
|
|
case LOADER_ID_SUBKEYS:
|
|
mSubkeysAdapter.swapCursor(data);
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This is called when the last Cursor provided to onLoadFinished() above is about to be closed.
|
|
* We need to make sure we are no longer using it.
|
|
*/
|
|
public void onLoaderReset(Loader<Cursor> loader) {
|
|
switch (loader.getId()) {
|
|
case LOADER_ID_USER_IDS:
|
|
mUserIdsAdapter.swapCursor(null);
|
|
break;
|
|
case LOADER_ID_SUBKEYS:
|
|
mSubkeysAdapter.swapCursor(null);
|
|
break;
|
|
}
|
|
}
|
|
|
|
private void changePassphrase() {
|
|
// Intent passIntent = new Intent(getActivity(), PassphraseWizardActivity.class);
|
|
// passIntent.setAction(PassphraseWizardActivity.CREATE_METHOD);
|
|
// startActivityForResult(passIntent, 12);
|
|
// Message is received after passphrase is cached
|
|
Handler returnHandler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message message) {
|
|
if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) {
|
|
Bundle data = message.getData();
|
|
|
|
// cache new returned passphrase!
|
|
mSaveKeyringParcel.mNewUnlock = new ChangeUnlockParcel(
|
|
(Passphrase) data.getParcelable(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE),
|
|
null
|
|
);
|
|
}
|
|
}
|
|
};
|
|
|
|
// Create a new Messenger for the communication back
|
|
Messenger messenger = new Messenger(returnHandler);
|
|
|
|
SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance(
|
|
messenger, R.string.title_change_passphrase);
|
|
|
|
setPassphraseDialog.show(getActivity().getSupportFragmentManager(), "setPassphraseDialog");
|
|
}
|
|
|
|
private void editUserId(final int position) {
|
|
final String userId = mUserIdsAdapter.getUserId(position);
|
|
final boolean isRevoked = mUserIdsAdapter.getIsRevoked(position);
|
|
final boolean isRevokedPending = mUserIdsAdapter.getIsRevokedPending(position);
|
|
|
|
Handler returnHandler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message message) {
|
|
switch (message.what) {
|
|
case EditUserIdDialogFragment.MESSAGE_CHANGE_PRIMARY_USER_ID:
|
|
// toggle
|
|
if (mSaveKeyringParcel.mChangePrimaryUserId != null
|
|
&& mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) {
|
|
mSaveKeyringParcel.mChangePrimaryUserId = null;
|
|
} else {
|
|
mSaveKeyringParcel.mChangePrimaryUserId = userId;
|
|
}
|
|
break;
|
|
case EditUserIdDialogFragment.MESSAGE_REVOKE:
|
|
// toggle
|
|
if (mSaveKeyringParcel.mRevokeUserIds.contains(userId)) {
|
|
mSaveKeyringParcel.mRevokeUserIds.remove(userId);
|
|
} else {
|
|
mSaveKeyringParcel.mRevokeUserIds.add(userId);
|
|
// not possible to revoke and change to primary user id
|
|
if (mSaveKeyringParcel.mChangePrimaryUserId != null
|
|
&& mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) {
|
|
mSaveKeyringParcel.mChangePrimaryUserId = null;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
getLoaderManager().getLoader(LOADER_ID_USER_IDS).forceLoad();
|
|
}
|
|
};
|
|
|
|
// Create a new Messenger for the communication back
|
|
final Messenger messenger = new Messenger(returnHandler);
|
|
|
|
DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
|
|
public void run() {
|
|
EditUserIdDialogFragment dialogFragment =
|
|
EditUserIdDialogFragment.newInstance(messenger, isRevoked, isRevokedPending);
|
|
dialogFragment.show(getActivity().getSupportFragmentManager(), "editUserIdDialog");
|
|
}
|
|
});
|
|
}
|
|
|
|
private void editSubkey(final int position) {
|
|
final long keyId = mSubkeysAdapter.getKeyId(position);
|
|
|
|
Handler returnHandler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message message) {
|
|
switch (message.what) {
|
|
case EditSubkeyDialogFragment.MESSAGE_CHANGE_EXPIRY:
|
|
editSubkeyExpiry(position);
|
|
break;
|
|
case EditSubkeyDialogFragment.MESSAGE_REVOKE:
|
|
// toggle
|
|
if (mSaveKeyringParcel.mRevokeSubKeys.contains(keyId)) {
|
|
mSaveKeyringParcel.mRevokeSubKeys.remove(keyId);
|
|
} else {
|
|
mSaveKeyringParcel.mRevokeSubKeys.add(keyId);
|
|
}
|
|
break;
|
|
case EditSubkeyDialogFragment.MESSAGE_STRIP: {
|
|
SecretKeyType secretKeyType = mSubkeysAdapter.getSecretKeyType(position);
|
|
if (secretKeyType == SecretKeyType.GNU_DUMMY) {
|
|
// Key is already stripped; this is a no-op.
|
|
break;
|
|
}
|
|
|
|
SubkeyChange change = mSaveKeyringParcel.getSubkeyChange(keyId);
|
|
if (change == null) {
|
|
mSaveKeyringParcel.mChangeSubKeys.add(new SubkeyChange(keyId, true, false));
|
|
break;
|
|
}
|
|
// toggle
|
|
change.mDummyStrip = !change.mDummyStrip;
|
|
if (change.mDummyStrip && change.mMoveKeyToCard) {
|
|
// User had chosen to divert key, but now wants to strip it instead.
|
|
change.mMoveKeyToCard = false;
|
|
}
|
|
break;
|
|
}
|
|
case EditSubkeyDialogFragment.MESSAGE_KEYTOCARD: {
|
|
Activity activity = EditKeyFragment.this.getActivity();
|
|
SecretKeyType secretKeyType = mSubkeysAdapter.getSecretKeyType(position);
|
|
if (secretKeyType == SecretKeyType.DIVERT_TO_CARD ||
|
|
secretKeyType == SecretKeyType.GNU_DUMMY) {
|
|
Notify.create(activity, R.string.edit_key_error_bad_nfc_stripped, Notify.Style.ERROR)
|
|
.show((ViewGroup) activity.findViewById(R.id.import_snackbar));
|
|
break;
|
|
}
|
|
int algorithm = mSubkeysAdapter.getAlgorithm(position);
|
|
// these are the PGP constants for RSA_GENERAL, RSA_ENCRYPT and RSA_SIGN
|
|
if (algorithm != 1 && algorithm != 2 && algorithm != 3) {
|
|
Notify.create(activity, R.string.edit_key_error_bad_nfc_algo, Notify.Style.ERROR)
|
|
.show((ViewGroup) activity.findViewById(R.id.import_snackbar));
|
|
break;
|
|
}
|
|
if (mSubkeysAdapter.getKeySize(position) != 2048) {
|
|
Notify.create(activity, R.string.edit_key_error_bad_nfc_size, Notify.Style.ERROR)
|
|
.show((ViewGroup) activity.findViewById(R.id.import_snackbar));
|
|
break;
|
|
}
|
|
|
|
|
|
SubkeyChange change;
|
|
change = mSaveKeyringParcel.getSubkeyChange(keyId);
|
|
if (change == null) {
|
|
mSaveKeyringParcel.mChangeSubKeys.add(
|
|
new SubkeyChange(keyId, false, true)
|
|
);
|
|
break;
|
|
}
|
|
// toggle
|
|
change.mMoveKeyToCard = !change.mMoveKeyToCard;
|
|
if (change.mMoveKeyToCard && change.mDummyStrip) {
|
|
// User had chosen to strip key, but now wants to divert it.
|
|
change.mDummyStrip = false;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
getLoaderManager().getLoader(LOADER_ID_SUBKEYS).forceLoad();
|
|
}
|
|
};
|
|
|
|
// Create a new Messenger for the communication back
|
|
final Messenger messenger = new Messenger(returnHandler);
|
|
|
|
DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
|
|
public void run() {
|
|
EditSubkeyDialogFragment dialogFragment =
|
|
EditSubkeyDialogFragment.newInstance(messenger);
|
|
|
|
dialogFragment.show(getActivity().getSupportFragmentManager(), "editSubkeyDialog");
|
|
}
|
|
});
|
|
}
|
|
|
|
private void editSubkeyExpiry(final int position) {
|
|
final long keyId = mSubkeysAdapter.getKeyId(position);
|
|
final Long creationDate = mSubkeysAdapter.getCreationDate(position);
|
|
final Long expiryDate = mSubkeysAdapter.getExpiryDate(position);
|
|
|
|
Handler returnHandler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message message) {
|
|
switch (message.what) {
|
|
case EditSubkeyExpiryDialogFragment.MESSAGE_NEW_EXPIRY:
|
|
mSaveKeyringParcel.getOrCreateSubkeyChange(keyId).mExpiry =
|
|
(Long) message.getData().getSerializable(
|
|
EditSubkeyExpiryDialogFragment.MESSAGE_DATA_EXPIRY);
|
|
break;
|
|
}
|
|
getLoaderManager().getLoader(LOADER_ID_SUBKEYS).forceLoad();
|
|
}
|
|
};
|
|
|
|
// Create a new Messenger for the communication back
|
|
final Messenger messenger = new Messenger(returnHandler);
|
|
|
|
DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
|
|
public void run() {
|
|
EditSubkeyExpiryDialogFragment dialogFragment =
|
|
EditSubkeyExpiryDialogFragment.newInstance(messenger, creationDate, expiryDate);
|
|
|
|
dialogFragment.show(getActivity().getSupportFragmentManager(), "editSubkeyExpiryDialog");
|
|
}
|
|
});
|
|
}
|
|
|
|
private void addUserId() {
|
|
Handler returnHandler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message message) {
|
|
if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) {
|
|
Bundle data = message.getData();
|
|
|
|
// add new user id
|
|
mUserIdsAddedAdapter.add(data
|
|
.getString(AddUserIdDialogFragment.MESSAGE_DATA_USER_ID));
|
|
}
|
|
}
|
|
};
|
|
|
|
// Create a new Messenger for the communication back
|
|
Messenger messenger = new Messenger(returnHandler);
|
|
|
|
// pre-fill out primary name
|
|
String predefinedName = KeyRing.splitUserId(mPrimaryUserId).name;
|
|
AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger,
|
|
predefinedName);
|
|
|
|
addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog");
|
|
}
|
|
|
|
private void addSubkey() {
|
|
boolean willBeMasterKey;
|
|
if (mSubkeysAdapter != null) {
|
|
willBeMasterKey = mSubkeysAdapter.getCount() == 0 && mSubkeysAddedAdapter.getCount() == 0;
|
|
} else {
|
|
willBeMasterKey = mSubkeysAddedAdapter.getCount() == 0;
|
|
}
|
|
|
|
AddSubkeyDialogFragment addSubkeyDialogFragment =
|
|
AddSubkeyDialogFragment.newInstance(willBeMasterKey);
|
|
addSubkeyDialogFragment
|
|
.setOnAlgorithmSelectedListener(
|
|
new AddSubkeyDialogFragment.OnAlgorithmSelectedListener() {
|
|
@Override
|
|
public void onAlgorithmSelected(SaveKeyringParcel.SubkeyAdd newSubkey) {
|
|
mSubkeysAddedAdapter.add(newSubkey);
|
|
}
|
|
}
|
|
);
|
|
addSubkeyDialogFragment.show(getActivity().getSupportFragmentManager(), "addSubkeyDialog");
|
|
}
|
|
|
|
private void returnKeyringParcel() {
|
|
if (mSaveKeyringParcel.mAddUserIds.size() == 0) {
|
|
Notify.create(getActivity(), R.string.edit_key_error_add_identity, Notify.Style.ERROR).show();
|
|
return;
|
|
}
|
|
if (mSaveKeyringParcel.mAddSubKeys.size() == 0) {
|
|
Notify.create(getActivity(), R.string.edit_key_error_add_subkey, Notify.Style.ERROR).show();
|
|
return;
|
|
}
|
|
|
|
// use first user id as primary
|
|
mSaveKeyringParcel.mChangePrimaryUserId = mSaveKeyringParcel.mAddUserIds.get(0);
|
|
|
|
Intent returnIntent = new Intent();
|
|
returnIntent.putExtra(EditKeyActivity.EXTRA_SAVE_KEYRING_PARCEL, mSaveKeyringParcel);
|
|
getActivity().setResult(Activity.RESULT_OK, returnIntent);
|
|
getActivity().finish();
|
|
}
|
|
|
|
@Override
|
|
protected void cryptoOperation(CryptoInputParcel cryptoInput) {
|
|
|
|
Log.d(Constants.TAG, "cryptoInput:\n" + cryptoInput);
|
|
Log.d(Constants.TAG, "mSaveKeyringParcel:\n" + mSaveKeyringParcel);
|
|
|
|
ServiceProgressHandler saveHandler = new ServiceProgressHandler(
|
|
getActivity(),
|
|
getString(R.string.progress_saving),
|
|
ProgressDialog.STYLE_HORIZONTAL,
|
|
true
|
|
) {
|
|
public void handleMessage(Message message) {
|
|
// handle messages by standard KeychainIntentServiceHandler first
|
|
super.handleMessage(message);
|
|
|
|
if (handlePendingMessage(message)) {
|
|
return;
|
|
}
|
|
|
|
if (message.arg1 == MessageStatus.OKAY.ordinal()) {
|
|
|
|
// get returned data bundle
|
|
Bundle returnData = message.getData();
|
|
if (returnData == null) {
|
|
return;
|
|
}
|
|
final OperationResult result =
|
|
returnData.getParcelable(OperationResult.EXTRA_RESULT);
|
|
if (result == null) {
|
|
return;
|
|
}
|
|
|
|
// if bad -> display here!
|
|
if (!result.success()) {
|
|
result.createNotify(getActivity()).show();
|
|
return;
|
|
}
|
|
|
|
// if good -> finish, return result to showkey and display there!
|
|
Intent intent = new Intent();
|
|
intent.putExtra(OperationResult.EXTRA_RESULT, result);
|
|
getActivity().setResult(EditKeyActivity.RESULT_OK, intent);
|
|
getActivity().finish();
|
|
|
|
}
|
|
}
|
|
};
|
|
|
|
// Send all information needed to service to import key in other thread
|
|
Intent intent = new Intent(getActivity(), KeychainIntentService.class);
|
|
intent.setAction(KeychainIntentService.ACTION_EDIT_KEYRING);
|
|
|
|
// fill values for this action
|
|
Bundle data = new Bundle();
|
|
data.putParcelable(KeychainIntentService.EXTRA_CRYPTO_INPUT, cryptoInput);
|
|
data.putParcelable(KeychainIntentService.EDIT_KEYRING_PARCEL, mSaveKeyringParcel);
|
|
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
|
|
|
// Create a new Messenger for the communication back
|
|
Messenger messenger = new Messenger(saveHandler);
|
|
intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
|
|
|
// show progress dialog
|
|
saveHandler.showProgressDialog(getActivity());
|
|
|
|
// start service with intent
|
|
getActivity().startService(intent);
|
|
}
|
|
|
|
/**
|
|
* Closes this activity, returning a result parcel with a single error log entry.
|
|
*/
|
|
void finishWithError(LogType reason) {
|
|
// Prepare an intent with an EXTRA_RESULT
|
|
Intent intent = new Intent();
|
|
intent.putExtra(OperationResult.EXTRA_RESULT,
|
|
new SingletonResult(SingletonResult.RESULT_ERROR, reason));
|
|
|
|
// Finish with result
|
|
getActivity().setResult(EditKeyActivity.RESULT_OK, intent);
|
|
getActivity().finish();
|
|
}
|
|
|
|
}
|