mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-24 01:32:16 -05:00
Remove old edit button, rename activities
This commit is contained in:
Dominik Schürmann
parent
bd7b4ccf2b
commit
1ba41e7482
@ -86,12 +86,12 @@
|
|||||||
android:label="@string/title_wizard"
|
android:label="@string/title_wizard"
|
||||||
android:windowSoftInputMode="stateHidden" />
|
android:windowSoftInputMode="stateHidden" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.EditKeyActivity"
|
android:name=".ui.EditKeyActivityOld"
|
||||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||||
android:label="@string/title_edit_key"
|
android:label="@string/title_edit_key"
|
||||||
android:windowSoftInputMode="stateHidden" />
|
android:windowSoftInputMode="stateHidden" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.EditKeyActivityNew"
|
android:name=".ui.EditKeyActivity"
|
||||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||||
android:label="@string/title_edit_key"
|
android:label="@string/title_edit_key"
|
||||||
android:windowSoftInputMode="stateHidden" />
|
android:windowSoftInputMode="stateHidden" />
|
||||||
|
|||||||
@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.R;
|
|||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
||||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||||
import org.sufficientlysecure.keychain.remote.AccountSettings;
|
import org.sufficientlysecure.keychain.remote.AccountSettings;
|
||||||
import org.sufficientlysecure.keychain.ui.EditKeyActivity;
|
import org.sufficientlysecure.keychain.ui.EditKeyActivityOld;
|
||||||
import org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment;
|
import org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment;
|
||||||
import org.sufficientlysecure.keychain.ui.adapter.KeyValueSpinnerAdapter;
|
import org.sufficientlysecure.keychain.ui.adapter.KeyValueSpinnerAdapter;
|
||||||
import org.sufficientlysecure.keychain.util.AlgorithmNames;
|
import org.sufficientlysecure.keychain.util.AlgorithmNames;
|
||||||
@ -163,11 +163,11 @@ public class AccountSettingsFragment extends Fragment implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createKey() {
|
private void createKey() {
|
||||||
Intent intent = new Intent(getActivity(), EditKeyActivity.class);
|
Intent intent = new Intent(getActivity(), EditKeyActivityOld.class);
|
||||||
intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);
|
intent.setAction(EditKeyActivityOld.ACTION_CREATE_KEY);
|
||||||
intent.putExtra(EditKeyActivity.EXTRA_GENERATE_DEFAULT_KEYS, true);
|
intent.putExtra(EditKeyActivityOld.EXTRA_GENERATE_DEFAULT_KEYS, true);
|
||||||
// set default user id to account name
|
// set default user id to account name
|
||||||
intent.putExtra(EditKeyActivity.EXTRA_USER_IDS, mAccSettings.getAccountName());
|
intent.putExtra(EditKeyActivityOld.EXTRA_USER_IDS, mAccSettings.getAccountName());
|
||||||
startActivityForResult(intent, REQUEST_CODE_CREATE_KEY);
|
startActivityForResult(intent, REQUEST_CODE_CREATE_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||||
* Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
|
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -18,732 +17,52 @@
|
|||||||
|
|
||||||
package org.sufficientlysecure.keychain.ui;
|
package org.sufficientlysecure.keychain.ui;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.ProgressDialog;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Message;
|
|
||||||
import android.os.Messenger;
|
|
||||||
import android.support.v4.app.ActivityCompat;
|
|
||||||
import android.support.v7.app.ActionBarActivity;
|
import android.support.v7.app.ActionBarActivity;
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.View.OnClickListener;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.CheckBox;
|
|
||||||
import android.widget.CompoundButton;
|
|
||||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.devspark.appmsg.AppMsg;
|
|
||||||
|
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
import org.sufficientlysecure.keychain.helper.ActionBarHelper;
|
|
||||||
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.UncachedSecretKey;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.WrappedSecretKey;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.WrappedSecretKeyRing;
|
|
||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
|
||||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
|
||||||
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
|
||||||
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
|
|
||||||
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
|
||||||
import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
|
|
||||||
import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
|
|
||||||
import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.Editor;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.Editor.EditorListener;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.KeyEditor;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.SectionView;
|
|
||||||
import org.sufficientlysecure.keychain.ui.widget.UserIdEditor;
|
|
||||||
import org.sufficientlysecure.keychain.util.Log;
|
import org.sufficientlysecure.keychain.util.Log;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
public class EditKeyActivity extends ActionBarActivity {
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
public class EditKeyActivity extends ActionBarActivity implements EditorListener {
|
private EditKeyFragment mEditKeyFragment;
|
||||||
|
|
||||||
// Actions for internal use only:
|
|
||||||
public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
|
|
||||||
public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEY";
|
|
||||||
|
|
||||||
// possible extra keys
|
|
||||||
public static final String EXTRA_USER_IDS = "user_ids";
|
|
||||||
public static final String EXTRA_NO_PASSPHRASE = "no_passphrase";
|
|
||||||
public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generate_default_keys";
|
|
||||||
|
|
||||||
// EDIT
|
|
||||||
private Uri mDataUri;
|
|
||||||
|
|
||||||
private SectionView mUserIdsView;
|
|
||||||
private SectionView mKeysView;
|
|
||||||
|
|
||||||
private String mCurrentPassphrase = null;
|
|
||||||
private String mNewPassphrase = null;
|
|
||||||
private String mSavedNewPassphrase = null;
|
|
||||||
private boolean mIsPassphraseSet;
|
|
||||||
private boolean mNeedsSaving;
|
|
||||||
private boolean mIsBrandNewKeyring = false;
|
|
||||||
|
|
||||||
private Button mChangePassphrase;
|
|
||||||
|
|
||||||
private CheckBox mNoPassphrase;
|
|
||||||
|
|
||||||
Vector<String> mUserIds;
|
|
||||||
Vector<UncachedSecretKey> mKeys;
|
|
||||||
Vector<Integer> mKeysUsages;
|
|
||||||
boolean mMasterCanSign = true;
|
|
||||||
|
|
||||||
ExportHelper mExportHelper;
|
|
||||||
|
|
||||||
public boolean needsSaving() {
|
|
||||||
mNeedsSaving = (mUserIdsView == null) ? false : mUserIdsView.needsSaving();
|
|
||||||
mNeedsSaving |= (mKeysView == null) ? false : mKeysView.needsSaving();
|
|
||||||
mNeedsSaving |= hasPassphraseChanged();
|
|
||||||
mNeedsSaving |= mIsBrandNewKeyring;
|
|
||||||
return mNeedsSaving;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void somethingChanged() {
|
|
||||||
ActivityCompat.invalidateOptionsMenu(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onDeleted(Editor e, boolean wasNewItem) {
|
|
||||||
somethingChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onEdited() {
|
|
||||||
somethingChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
mExportHelper = new ExportHelper(this);
|
setContentView(R.layout.edit_key_activity_new);
|
||||||
|
|
||||||
// Inflate a "Done"/"Cancel" custom action bar view
|
Uri dataUri = getIntent().getData();
|
||||||
ActionBarHelper.setTwoButtonView(getSupportActionBar(),
|
if (dataUri == null) {
|
||||||
R.string.btn_save, R.drawable.ic_action_save,
|
Log.e(Constants.TAG, "Data missing. Should be Uri of key!");
|
||||||
new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// Save
|
|
||||||
saveClicked();
|
|
||||||
}
|
|
||||||
}, R.string.menu_key_edit_cancel, R.drawable.ic_action_cancel,
|
|
||||||
new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// Cancel
|
|
||||||
cancelClicked();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
mUserIds = new Vector<String>();
|
|
||||||
mKeys = new Vector<UncachedSecretKey>();
|
|
||||||
mKeysUsages = new Vector<Integer>();
|
|
||||||
|
|
||||||
// Catch Intents opened from other apps
|
|
||||||
Intent intent = getIntent();
|
|
||||||
String action = intent.getAction();
|
|
||||||
if (ACTION_CREATE_KEY.equals(action)) {
|
|
||||||
handleActionCreateKey(intent);
|
|
||||||
} else if (ACTION_EDIT_KEY.equals(action)) {
|
|
||||||
handleActionEditKey(intent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle intent action to create new key
|
|
||||||
*
|
|
||||||
* @param intent
|
|
||||||
*/
|
|
||||||
private void handleActionCreateKey(Intent intent) {
|
|
||||||
Bundle extras = intent.getExtras();
|
|
||||||
|
|
||||||
mCurrentPassphrase = "";
|
|
||||||
mIsBrandNewKeyring = true;
|
|
||||||
|
|
||||||
if (extras != null) {
|
|
||||||
// if userId is given, prefill the fields
|
|
||||||
if (extras.containsKey(EXTRA_USER_IDS)) {
|
|
||||||
Log.d(Constants.TAG, "UserIds are given!");
|
|
||||||
mUserIds.add(extras.getString(EXTRA_USER_IDS));
|
|
||||||
}
|
|
||||||
|
|
||||||
// if no passphrase is given
|
|
||||||
if (extras.containsKey(EXTRA_NO_PASSPHRASE)) {
|
|
||||||
boolean noPassphrase = extras.getBoolean(EXTRA_NO_PASSPHRASE);
|
|
||||||
if (noPassphrase) {
|
|
||||||
// check "no passphrase" checkbox and remove button
|
|
||||||
mNoPassphrase.setChecked(true);
|
|
||||||
mChangePassphrase.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// generate key
|
|
||||||
if (extras.containsKey(EXTRA_GENERATE_DEFAULT_KEYS)) {
|
|
||||||
/*
|
|
||||||
boolean generateDefaultKeys = extras.getBoolean(EXTRA_GENERATE_DEFAULT_KEYS);
|
|
||||||
if (generateDefaultKeys) {
|
|
||||||
|
|
||||||
// fill values for this action
|
|
||||||
Bundle data = new Bundle();
|
|
||||||
data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE,
|
|
||||||
mCurrentPassphrase);
|
|
||||||
|
|
||||||
serviceIntent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
|
||||||
|
|
||||||
// Message is received after generating is done in KeychainIntentService
|
|
||||||
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
|
|
||||||
this, getResources().getQuantityString(R.plurals.progress_generating, 1),
|
|
||||||
ProgressDialog.STYLE_HORIZONTAL, true,
|
|
||||||
|
|
||||||
new DialogInterface.OnCancelListener() {
|
|
||||||
@Override
|
|
||||||
public void onCancel(DialogInterface dialog) {
|
|
||||||
// Stop key generation on cancel
|
|
||||||
stopService(serviceIntent);
|
|
||||||
EditKeyActivity.this.setResult(Activity.RESULT_CANCELED);
|
|
||||||
EditKeyActivity.this.finish();
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handleMessage(Message message) {
|
|
||||||
// handle messages by standard KeychainIntentServiceHandler first
|
|
||||||
super.handleMessage(message);
|
|
||||||
|
|
||||||
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
|
|
||||||
// get new key from data bundle returned from service
|
|
||||||
Bundle data = message.getDataAsStringList();
|
|
||||||
|
|
||||||
ArrayList<UncachedSecretKey> newKeys =
|
|
||||||
PgpConversionHelper.BytesToPGPSecretKeyList(data
|
|
||||||
.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
|
|
||||||
|
|
||||||
ArrayList<Integer> keyUsageFlags = data.getIntegerArrayList(
|
|
||||||
KeychainIntentService.RESULT_KEY_USAGES);
|
|
||||||
|
|
||||||
if (newKeys.size() == keyUsageFlags.size()) {
|
|
||||||
for (int i = 0; i < newKeys.size(); ++i) {
|
|
||||||
mKeys.add(newKeys.get(i));
|
|
||||||
mKeysUsages.add(keyUsageFlags.get(i));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildLayout(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create a new Messenger for the communication back
|
|
||||||
Messenger messenger = new Messenger(saveHandler);
|
|
||||||
serviceIntent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
|
||||||
|
|
||||||
saveHandler.showProgressDialog(this);
|
|
||||||
|
|
||||||
// start service with intent
|
|
||||||
startService(serviceIntent);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
buildLayout(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle intent action to edit existing key
|
|
||||||
*
|
|
||||||
* @param intent
|
|
||||||
*/
|
|
||||||
private void handleActionEditKey(Intent intent) {
|
|
||||||
mDataUri = intent.getData();
|
|
||||||
if (mDataUri == null) {
|
|
||||||
Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
|
|
||||||
finish();
|
finish();
|
||||||
} else {
|
|
||||||
Log.d(Constants.TAG, "uri: " + mDataUri);
|
|
||||||
|
|
||||||
try {
|
|
||||||
Uri secretUri = KeyRings.buildUnifiedKeyRingUri(mDataUri);
|
|
||||||
WrappedSecretKeyRing keyRing = new ProviderHelper(this).getWrappedSecretKeyRing(secretUri);
|
|
||||||
|
|
||||||
mMasterCanSign = keyRing.getSubKey().canCertify();
|
|
||||||
for (WrappedSecretKey key : keyRing.secretKeyIterator()) {
|
|
||||||
// Turn into uncached instance
|
|
||||||
mKeys.add(key.getUncached());
|
|
||||||
mKeysUsages.add(key.getKeyUsage()); // get usage when view is created
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isSet = false;
|
|
||||||
for (String userId : keyRing.getSubKey().getUserIds()) {
|
|
||||||
Log.d(Constants.TAG, "Added userId " + userId);
|
|
||||||
if (!isSet) {
|
|
||||||
isSet = true;
|
|
||||||
String[] parts = KeyRing.splitUserId(userId);
|
|
||||||
if (parts[0] != null) {
|
|
||||||
setTitle(parts[0]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mUserIds.add(userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
buildLayout(false);
|
|
||||||
|
|
||||||
mCurrentPassphrase = "";
|
|
||||||
mIsPassphraseSet = keyRing.hasPassphrase();
|
|
||||||
if (!mIsPassphraseSet) {
|
|
||||||
// check "no passphrase" checkbox and remove button
|
|
||||||
mNoPassphrase.setChecked(true);
|
|
||||||
mChangePassphrase.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (ProviderHelper.NotFoundException e) {
|
|
||||||
Log.e(Constants.TAG, "Keyring not found: " + e.getMessage(), e);
|
|
||||||
Toast.makeText(this, R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show();
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the dialog to set a new passphrase
|
|
||||||
*/
|
|
||||||
private void showSetPassphraseDialog() {
|
|
||||||
// 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();
|
|
||||||
|
|
||||||
// set new returned passphrase!
|
|
||||||
mNewPassphrase = data
|
|
||||||
.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE);
|
|
||||||
|
|
||||||
updatePassphraseButtonText();
|
|
||||||
somethingChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create a new Messenger for the communication back
|
|
||||||
Messenger messenger = new Messenger(returnHandler);
|
|
||||||
|
|
||||||
// set title based on isPassphraseSet()
|
|
||||||
int title;
|
|
||||||
if (isPassphraseSet()) {
|
|
||||||
title = R.string.title_change_passphrase;
|
|
||||||
} else {
|
|
||||||
title = R.string.title_set_passphrase;
|
|
||||||
}
|
|
||||||
|
|
||||||
SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance(
|
|
||||||
messenger, null, title);
|
|
||||||
|
|
||||||
setPassphraseDialog.show(getSupportFragmentManager(), "setPassphraseDialog");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build layout based on mUserId, mKeys and mKeysUsages Vectors. It creates Views for every user
|
|
||||||
* id and key.
|
|
||||||
*
|
|
||||||
* @param newKeys
|
|
||||||
*/
|
|
||||||
private void buildLayout(boolean newKeys) {
|
|
||||||
setContentView(R.layout.edit_key_activity);
|
|
||||||
|
|
||||||
// find views
|
|
||||||
mChangePassphrase = (Button) findViewById(R.id.edit_key_btn_change_passphrase);
|
|
||||||
mNoPassphrase = (CheckBox) findViewById(R.id.edit_key_no_passphrase);
|
|
||||||
// Build layout based on given userIds and keys
|
|
||||||
|
|
||||||
LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
||||||
|
|
||||||
LinearLayout container = (LinearLayout) findViewById(R.id.edit_key_container);
|
|
||||||
if (mIsPassphraseSet) {
|
|
||||||
mChangePassphrase.setText(getString(R.string.btn_change_passphrase));
|
|
||||||
}
|
|
||||||
mUserIdsView = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
|
|
||||||
mUserIdsView.setType(SectionView.TYPE_USER_ID);
|
|
||||||
mUserIdsView.setCanBeEdited(mMasterCanSign);
|
|
||||||
mUserIdsView.setUserIds(mUserIds);
|
|
||||||
mUserIdsView.setEditorListener(this);
|
|
||||||
container.addView(mUserIdsView);
|
|
||||||
mKeysView = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
|
|
||||||
mKeysView.setType(SectionView.TYPE_KEY);
|
|
||||||
mKeysView.setCanBeEdited(mMasterCanSign);
|
|
||||||
mKeysView.setKeys(mKeys, mKeysUsages, newKeys);
|
|
||||||
mKeysView.setEditorListener(this);
|
|
||||||
container.addView(mKeysView);
|
|
||||||
|
|
||||||
updatePassphraseButtonText();
|
|
||||||
|
|
||||||
mChangePassphrase.setOnClickListener(new OnClickListener() {
|
|
||||||
public void onClick(View v) {
|
|
||||||
showSetPassphraseDialog();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// disable passphrase when no passphrase checkbox is checked!
|
|
||||||
mNoPassphrase.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
|
||||||
if (isChecked) {
|
|
||||||
// remove passphrase
|
|
||||||
mSavedNewPassphrase = mNewPassphrase;
|
|
||||||
mNewPassphrase = "";
|
|
||||||
mChangePassphrase.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
mNewPassphrase = mSavedNewPassphrase;
|
|
||||||
mChangePassphrase.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
somethingChanged();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private long getMasterKeyId() {
|
|
||||||
if (mKeysView.getEditors().getChildCount() == 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return ((KeyEditor) mKeysView.getEditors().getChildAt(0)).getValue().getKeyId();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isPassphraseSet() {
|
|
||||||
if (mNoPassphrase.isChecked()) {
|
|
||||||
return true;
|
|
||||||
} else if ((mIsPassphraseSet)
|
|
||||||
|| (mNewPassphrase != null && !mNewPassphrase.equals(""))) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasPassphraseChanged() {
|
|
||||||
if (mNoPassphrase != null) {
|
|
||||||
if (mNoPassphrase.isChecked()) {
|
|
||||||
return mIsPassphraseSet;
|
|
||||||
} else {
|
|
||||||
return (mNewPassphrase != null && !mNewPassphrase.equals(""));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveClicked() {
|
|
||||||
final long masterKeyId = getMasterKeyId();
|
|
||||||
if (needsSaving()) { //make sure, as some versions don't support invalidateOptionsMenu
|
|
||||||
try {
|
|
||||||
if (!isPassphraseSet()) {
|
|
||||||
throw new PgpGeneralException(this.getString(R.string.set_a_passphrase));
|
|
||||||
}
|
|
||||||
|
|
||||||
String passphrase;
|
|
||||||
if (mIsPassphraseSet) {
|
|
||||||
passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
|
|
||||||
} else {
|
|
||||||
passphrase = "";
|
|
||||||
}
|
|
||||||
if (passphrase == null) {
|
|
||||||
PassphraseDialogFragment.show(this, masterKeyId,
|
|
||||||
new Handler() {
|
|
||||||
@Override
|
|
||||||
public void handleMessage(Message message) {
|
|
||||||
if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
|
|
||||||
mCurrentPassphrase = PassphraseCacheService.getCachedPassphrase(
|
|
||||||
EditKeyActivity.this, masterKeyId);
|
|
||||||
checkEmptyIDsWanted();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
mCurrentPassphrase = passphrase;
|
|
||||||
checkEmptyIDsWanted();
|
|
||||||
}
|
|
||||||
} catch (PgpGeneralException e) {
|
|
||||||
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
|
|
||||||
AppMsg.STYLE_ALERT).show();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
AppMsg.makeText(this, R.string.error_change_something_first, AppMsg.STYLE_ALERT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void checkEmptyIDsWanted() {
|
|
||||||
try {
|
|
||||||
ArrayList<String> userIDs = getUserIds(mUserIdsView);
|
|
||||||
List<Boolean> newIDs = mUserIdsView.getNewIDFlags();
|
|
||||||
ArrayList<String> originalIDs = mUserIdsView.getOriginalIDs();
|
|
||||||
int curID = 0;
|
|
||||||
for (String userID : userIDs) {
|
|
||||||
if (userID.equals("") && (!userID.equals(originalIDs.get(curID)) || newIDs.get(curID))) {
|
|
||||||
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(
|
|
||||||
EditKeyActivity.this);
|
|
||||||
|
|
||||||
alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
|
|
||||||
alert.setTitle(R.string.warning);
|
|
||||||
alert.setMessage(EditKeyActivity.this.getString(R.string.ask_empty_id_ok));
|
|
||||||
|
|
||||||
alert.setPositiveButton(EditKeyActivity.this.getString(android.R.string.yes),
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
|
||||||
dialog.dismiss();
|
|
||||||
finallySaveClicked();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
alert.setNegativeButton(this.getString(android.R.string.no),
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
|
||||||
dialog.dismiss();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
alert.setCancelable(false);
|
|
||||||
alert.show();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
curID++;
|
|
||||||
}
|
loadFragment(savedInstanceState, dataUri);
|
||||||
} catch (PgpGeneralException e) {
|
|
||||||
Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
|
|
||||||
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()), AppMsg.STYLE_ALERT).show();
|
|
||||||
}
|
|
||||||
finallySaveClicked();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean[] toPrimitiveArray(final List<Boolean> booleanList) {
|
private void loadFragment(Bundle savedInstanceState, Uri dataUri) {
|
||||||
final boolean[] primitives = new boolean[booleanList.size()];
|
// However, if we're being restored from a previous state,
|
||||||
int index = 0;
|
// then we don't need to do anything and should return or else
|
||||||
for (Boolean object : booleanList) {
|
// we could end up with overlapping fragments.
|
||||||
primitives[index++] = object;
|
if (savedInstanceState != null) {
|
||||||
}
|
return;
|
||||||
return primitives;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void finallySaveClicked() {
|
// Create an instance of the fragment
|
||||||
/*
|
mEditKeyFragment = EditKeyFragment.newInstance(dataUri);
|
||||||
try {
|
|
||||||
// Send all information needed to service to edit key in other thread
|
|
||||||
Intent intent = new Intent(this, KeychainIntentService.class);
|
|
||||||
|
|
||||||
intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING);
|
// Add the fragment to the 'fragment_container' FrameLayout
|
||||||
|
// NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
|
||||||
OldSaveKeyringParcel saveParams = new OldSaveKeyringParcel();
|
getSupportFragmentManager().beginTransaction()
|
||||||
saveParams.userIds = getUserIds(mUserIdsView);
|
.replace(R.id.edit_key_fragment_container, mEditKeyFragment)
|
||||||
saveParams.originalIDs = mUserIdsView.getOriginalIDs();
|
.commitAllowingStateLoss();
|
||||||
saveParams.deletedIDs = mUserIdsView.getDeletedIDs();
|
// do it immediately!
|
||||||
saveParams.newIDs = toPrimitiveArray(mUserIdsView.getNewIDFlags());
|
getSupportFragmentManager().executePendingTransactions();
|
||||||
saveParams.primaryIDChanged = mUserIdsView.primaryChanged();
|
|
||||||
saveParams.moddedKeys = toPrimitiveArray(mKeysView.getNeedsSavingArray());
|
|
||||||
saveParams.deletedKeys = mKeysView.getDeletedKeys();
|
|
||||||
saveParams.keysExpiryDates = getKeysExpiryDates(mKeysView);
|
|
||||||
saveParams.keysUsages = getKeysUsages(mKeysView);
|
|
||||||
saveParams.newPassphrase = mNewPassphrase;
|
|
||||||
saveParams.oldPassphrase = mCurrentPassphrase;
|
|
||||||
saveParams.newKeys = toPrimitiveArray(mKeysView.getNewKeysArray());
|
|
||||||
saveParams.keys = getKeys(mKeysView);
|
|
||||||
saveParams.originalPrimaryID = mUserIdsView.getOriginalPrimaryID();
|
|
||||||
|
|
||||||
// fill values for this action
|
|
||||||
Bundle data = new Bundle();
|
|
||||||
data.putBoolean(KeychainIntentService.SAVE_KEYRING_CAN_SIGN, mMasterCanSign);
|
|
||||||
data.putParcelable(KeychainIntentService.SAVE_KEYRING_PARCEL, saveParams);
|
|
||||||
|
|
||||||
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
|
||||||
|
|
||||||
// Message is received after saving is done in KeychainIntentService
|
|
||||||
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
|
|
||||||
getString(R.string.progress_saving), ProgressDialog.STYLE_HORIZONTAL) {
|
|
||||||
public void handleMessage(Message message) {
|
|
||||||
// handle messages by standard KeychainIntentServiceHandler first
|
|
||||||
super.handleMessage(message);
|
|
||||||
|
|
||||||
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
|
|
||||||
Intent data = new Intent();
|
|
||||||
|
|
||||||
// return uri pointing to new created key
|
|
||||||
Uri uri = KeyRings.buildGenericKeyRingUri(getMasterKeyId());
|
|
||||||
data.setData(uri);
|
|
||||||
|
|
||||||
setResult(RESULT_OK, data);
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create a new Messenger for the communication back
|
|
||||||
Messenger messenger = new Messenger(saveHandler);
|
|
||||||
intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
|
||||||
|
|
||||||
saveHandler.showProgressDialog(this);
|
|
||||||
|
|
||||||
// start service with intent
|
|
||||||
startService(intent);
|
|
||||||
} catch (PgpGeneralException e) {
|
|
||||||
Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
|
|
||||||
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
|
|
||||||
AppMsg.STYLE_ALERT).show();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cancelClicked() {
|
|
||||||
if (needsSaving()) { //ask if we want to save
|
|
||||||
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(
|
|
||||||
EditKeyActivity.this);
|
|
||||||
|
|
||||||
alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
|
|
||||||
alert.setTitle(R.string.warning);
|
|
||||||
alert.setMessage(EditKeyActivity.this.getString(R.string.ask_save_changed_key));
|
|
||||||
|
|
||||||
alert.setPositiveButton(EditKeyActivity.this.getString(android.R.string.yes),
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
|
||||||
dialog.dismiss();
|
|
||||||
saveClicked();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
alert.setNegativeButton(this.getString(android.R.string.no),
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
|
||||||
dialog.dismiss();
|
|
||||||
setResult(RESULT_CANCELED);
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
alert.setCancelable(false);
|
|
||||||
alert.show();
|
|
||||||
} else {
|
|
||||||
setResult(RESULT_CANCELED);
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns user ids from the SectionView
|
|
||||||
*
|
|
||||||
* @param userIdsView
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private ArrayList<String> getUserIds(SectionView userIdsView) throws PgpGeneralException {
|
|
||||||
ArrayList<String> userIds = new ArrayList<String>();
|
|
||||||
|
|
||||||
ViewGroup userIdEditors = userIdsView.getEditors();
|
|
||||||
|
|
||||||
boolean gotMainUserId = false;
|
|
||||||
for (int i = 0; i < userIdEditors.getChildCount(); ++i) {
|
|
||||||
UserIdEditor editor = (UserIdEditor) userIdEditors.getChildAt(i);
|
|
||||||
String userId;
|
|
||||||
userId = editor.getValue();
|
|
||||||
|
|
||||||
if (editor.isMainUserId()) {
|
|
||||||
userIds.add(0, userId);
|
|
||||||
gotMainUserId = true;
|
|
||||||
} else {
|
|
||||||
userIds.add(userId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userIds.size() == 0) {
|
|
||||||
throw new PgpGeneralException(getString(R.string.error_key_needs_a_user_id));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!gotMainUserId) {
|
|
||||||
throw new PgpGeneralException(getString(R.string.error_main_user_id_must_not_be_empty));
|
|
||||||
}
|
|
||||||
|
|
||||||
return userIds;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns keys from the SectionView
|
|
||||||
*
|
|
||||||
* @param keysView
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private ArrayList<UncachedSecretKey> getKeys(SectionView keysView) throws PgpGeneralException {
|
|
||||||
ArrayList<UncachedSecretKey> keys = new ArrayList<UncachedSecretKey>();
|
|
||||||
|
|
||||||
ViewGroup keyEditors = keysView.getEditors();
|
|
||||||
|
|
||||||
if (keyEditors.getChildCount() == 0) {
|
|
||||||
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
|
||||||
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
|
||||||
keys.add(editor.getValue());
|
|
||||||
}
|
|
||||||
|
|
||||||
return keys;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns usage selections of keys from the SectionView
|
|
||||||
*
|
|
||||||
* @param keysView
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private ArrayList<Integer> getKeysUsages(SectionView keysView) throws PgpGeneralException {
|
|
||||||
ArrayList<Integer> keysUsages = new ArrayList<Integer>();
|
|
||||||
|
|
||||||
ViewGroup keyEditors = keysView.getEditors();
|
|
||||||
|
|
||||||
if (keyEditors.getChildCount() == 0) {
|
|
||||||
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
|
||||||
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
|
||||||
keysUsages.add(editor.getUsage());
|
|
||||||
}
|
|
||||||
|
|
||||||
return keysUsages;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ArrayList<Calendar> getKeysExpiryDates(SectionView keysView) throws PgpGeneralException {
|
|
||||||
ArrayList<Calendar> keysExpiryDates = new ArrayList<Calendar>();
|
|
||||||
|
|
||||||
ViewGroup keyEditors = keysView.getEditors();
|
|
||||||
|
|
||||||
if (keyEditors.getChildCount() == 0) {
|
|
||||||
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
|
||||||
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
|
||||||
keysExpiryDates.add(editor.getExpiryDate());
|
|
||||||
}
|
|
||||||
|
|
||||||
return keysExpiryDates;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updatePassphraseButtonText() {
|
|
||||||
mChangePassphrase.setText(isPassphraseSet() ? getString(R.string.btn_change_passphrase)
|
|
||||||
: getString(R.string.btn_set_passphrase));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.net.Uri;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v7.app.ActionBarActivity;
|
|
||||||
|
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
|
||||||
import org.sufficientlysecure.keychain.R;
|
|
||||||
import org.sufficientlysecure.keychain.util.Log;
|
|
||||||
|
|
||||||
public class EditKeyActivityNew extends ActionBarActivity {
|
|
||||||
|
|
||||||
private EditKeyFragment mEditKeyFragment;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
setContentView(R.layout.edit_key_activity_new);
|
|
||||||
|
|
||||||
Uri dataUri = getIntent().getData();
|
|
||||||
if (dataUri == null) {
|
|
||||||
Log.e(Constants.TAG, "Data missing. Should be Uri of key!");
|
|
||||||
finish();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
loadFragment(savedInstanceState, dataUri);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadFragment(Bundle savedInstanceState, Uri dataUri) {
|
|
||||||
// However, if we're being restored from a previous state,
|
|
||||||
// then we don't need to do anything and should return or else
|
|
||||||
// we could end up with overlapping fragments.
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create an instance of the fragment
|
|
||||||
mEditKeyFragment = EditKeyFragment.newInstance(dataUri);
|
|
||||||
|
|
||||||
// Add the fragment to the 'fragment_container' FrameLayout
|
|
||||||
// NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
|
|
||||||
getSupportFragmentManager().beginTransaction()
|
|
||||||
.replace(R.id.edit_key_fragment_container, mEditKeyFragment)
|
|
||||||
.commitAllowingStateLoss();
|
|
||||||
// do it immediately!
|
|
||||||
getSupportFragmentManager().executePendingTransactions();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -0,0 +1,744 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||||
|
* Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
|
||||||
|
*
|
||||||
|
* 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.content.Context;
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.content.Intent;
|
||||||
|
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.ActivityCompat;
|
||||||
|
import android.support.v7.app.ActionBarActivity;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.View.OnClickListener;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.CheckBox;
|
||||||
|
import android.widget.CompoundButton;
|
||||||
|
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.devspark.appmsg.AppMsg;
|
||||||
|
|
||||||
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
|
import org.sufficientlysecure.keychain.R;
|
||||||
|
import org.sufficientlysecure.keychain.helper.ActionBarHelper;
|
||||||
|
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
||||||
|
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
||||||
|
import org.sufficientlysecure.keychain.pgp.UncachedSecretKey;
|
||||||
|
import org.sufficientlysecure.keychain.pgp.WrappedSecretKey;
|
||||||
|
import org.sufficientlysecure.keychain.pgp.WrappedSecretKeyRing;
|
||||||
|
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
||||||
|
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||||
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||||
|
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
||||||
|
import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
|
||||||
|
import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
|
||||||
|
import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
|
||||||
|
import org.sufficientlysecure.keychain.ui.widget.Editor;
|
||||||
|
import org.sufficientlysecure.keychain.ui.widget.Editor.EditorListener;
|
||||||
|
import org.sufficientlysecure.keychain.ui.widget.KeyEditor;
|
||||||
|
import org.sufficientlysecure.keychain.ui.widget.SectionView;
|
||||||
|
import org.sufficientlysecure.keychain.ui.widget.UserIdEditor;
|
||||||
|
import org.sufficientlysecure.keychain.util.Log;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Vector;
|
||||||
|
|
||||||
|
public class EditKeyActivityOld extends ActionBarActivity implements EditorListener {
|
||||||
|
|
||||||
|
// Actions for internal use only:
|
||||||
|
public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
|
||||||
|
public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEY";
|
||||||
|
|
||||||
|
// possible extra keys
|
||||||
|
public static final String EXTRA_USER_IDS = "user_ids";
|
||||||
|
public static final String EXTRA_NO_PASSPHRASE = "no_passphrase";
|
||||||
|
public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generate_default_keys";
|
||||||
|
|
||||||
|
// EDIT
|
||||||
|
private Uri mDataUri;
|
||||||
|
|
||||||
|
private SectionView mUserIdsView;
|
||||||
|
private SectionView mKeysView;
|
||||||
|
|
||||||
|
private String mCurrentPassphrase = null;
|
||||||
|
private String mNewPassphrase = null;
|
||||||
|
private String mSavedNewPassphrase = null;
|
||||||
|
private boolean mIsPassphraseSet;
|
||||||
|
private boolean mNeedsSaving;
|
||||||
|
private boolean mIsBrandNewKeyring = false;
|
||||||
|
|
||||||
|
private Button mChangePassphrase;
|
||||||
|
|
||||||
|
private CheckBox mNoPassphrase;
|
||||||
|
|
||||||
|
Vector<String> mUserIds;
|
||||||
|
Vector<UncachedSecretKey> mKeys;
|
||||||
|
Vector<Integer> mKeysUsages;
|
||||||
|
boolean mMasterCanSign = true;
|
||||||
|
|
||||||
|
ExportHelper mExportHelper;
|
||||||
|
|
||||||
|
public boolean needsSaving() {
|
||||||
|
mNeedsSaving = (mUserIdsView == null) ? false : mUserIdsView.needsSaving();
|
||||||
|
mNeedsSaving |= (mKeysView == null) ? false : mKeysView.needsSaving();
|
||||||
|
mNeedsSaving |= hasPassphraseChanged();
|
||||||
|
mNeedsSaving |= mIsBrandNewKeyring;
|
||||||
|
return mNeedsSaving;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void somethingChanged() {
|
||||||
|
ActivityCompat.invalidateOptionsMenu(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onDeleted(Editor e, boolean wasNewItem) {
|
||||||
|
somethingChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onEdited() {
|
||||||
|
somethingChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
mExportHelper = new ExportHelper(this);
|
||||||
|
|
||||||
|
// Inflate a "Done"/"Cancel" custom action bar view
|
||||||
|
ActionBarHelper.setTwoButtonView(getSupportActionBar(),
|
||||||
|
R.string.btn_save, R.drawable.ic_action_save,
|
||||||
|
new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
// Save
|
||||||
|
saveClicked();
|
||||||
|
}
|
||||||
|
}, R.string.menu_key_edit_cancel, R.drawable.ic_action_cancel,
|
||||||
|
new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
// Cancel
|
||||||
|
cancelClicked();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
mUserIds = new Vector<String>();
|
||||||
|
mKeys = new Vector<UncachedSecretKey>();
|
||||||
|
mKeysUsages = new Vector<Integer>();
|
||||||
|
|
||||||
|
// Catch Intents opened from other apps
|
||||||
|
Intent intent = getIntent();
|
||||||
|
String action = intent.getAction();
|
||||||
|
if (ACTION_CREATE_KEY.equals(action)) {
|
||||||
|
handleActionCreateKey(intent);
|
||||||
|
} else if (ACTION_EDIT_KEY.equals(action)) {
|
||||||
|
handleActionEditKey(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle intent action to create new key
|
||||||
|
*
|
||||||
|
* @param intent
|
||||||
|
*/
|
||||||
|
private void handleActionCreateKey(Intent intent) {
|
||||||
|
Bundle extras = intent.getExtras();
|
||||||
|
|
||||||
|
mCurrentPassphrase = "";
|
||||||
|
mIsBrandNewKeyring = true;
|
||||||
|
|
||||||
|
if (extras != null) {
|
||||||
|
// if userId is given, prefill the fields
|
||||||
|
if (extras.containsKey(EXTRA_USER_IDS)) {
|
||||||
|
Log.d(Constants.TAG, "UserIds are given!");
|
||||||
|
mUserIds.add(extras.getString(EXTRA_USER_IDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
// if no passphrase is given
|
||||||
|
if (extras.containsKey(EXTRA_NO_PASSPHRASE)) {
|
||||||
|
boolean noPassphrase = extras.getBoolean(EXTRA_NO_PASSPHRASE);
|
||||||
|
if (noPassphrase) {
|
||||||
|
// check "no passphrase" checkbox and remove button
|
||||||
|
mNoPassphrase.setChecked(true);
|
||||||
|
mChangePassphrase.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// generate key
|
||||||
|
if (extras.containsKey(EXTRA_GENERATE_DEFAULT_KEYS)) {
|
||||||
|
/*
|
||||||
|
boolean generateDefaultKeys = extras.getBoolean(EXTRA_GENERATE_DEFAULT_KEYS);
|
||||||
|
if (generateDefaultKeys) {
|
||||||
|
|
||||||
|
// fill values for this action
|
||||||
|
Bundle data = new Bundle();
|
||||||
|
data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE,
|
||||||
|
mCurrentPassphrase);
|
||||||
|
|
||||||
|
serviceIntent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
||||||
|
|
||||||
|
// Message is received after generating is done in KeychainIntentService
|
||||||
|
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
|
||||||
|
this, getResources().getQuantityString(R.plurals.progress_generating, 1),
|
||||||
|
ProgressDialog.STYLE_HORIZONTAL, true,
|
||||||
|
|
||||||
|
new DialogInterface.OnCancelListener() {
|
||||||
|
@Override
|
||||||
|
public void onCancel(DialogInterface dialog) {
|
||||||
|
// Stop key generation on cancel
|
||||||
|
stopService(serviceIntent);
|
||||||
|
EditKeyActivity.this.setResult(Activity.RESULT_CANCELED);
|
||||||
|
EditKeyActivity.this.finish();
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handleMessage(Message message) {
|
||||||
|
// handle messages by standard KeychainIntentServiceHandler first
|
||||||
|
super.handleMessage(message);
|
||||||
|
|
||||||
|
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
|
||||||
|
// get new key from data bundle returned from service
|
||||||
|
Bundle data = message.getDataAsStringList();
|
||||||
|
|
||||||
|
ArrayList<UncachedSecretKey> newKeys =
|
||||||
|
PgpConversionHelper.BytesToPGPSecretKeyList(data
|
||||||
|
.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
|
||||||
|
|
||||||
|
ArrayList<Integer> keyUsageFlags = data.getIntegerArrayList(
|
||||||
|
KeychainIntentService.RESULT_KEY_USAGES);
|
||||||
|
|
||||||
|
if (newKeys.size() == keyUsageFlags.size()) {
|
||||||
|
for (int i = 0; i < newKeys.size(); ++i) {
|
||||||
|
mKeys.add(newKeys.get(i));
|
||||||
|
mKeysUsages.add(keyUsageFlags.get(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buildLayout(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create a new Messenger for the communication back
|
||||||
|
Messenger messenger = new Messenger(saveHandler);
|
||||||
|
serviceIntent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
||||||
|
|
||||||
|
saveHandler.showProgressDialog(this);
|
||||||
|
|
||||||
|
// start service with intent
|
||||||
|
startService(serviceIntent);
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
buildLayout(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle intent action to edit existing key
|
||||||
|
*
|
||||||
|
* @param intent
|
||||||
|
*/
|
||||||
|
private void handleActionEditKey(Intent intent) {
|
||||||
|
mDataUri = intent.getData();
|
||||||
|
if (mDataUri == null) {
|
||||||
|
Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
|
||||||
|
finish();
|
||||||
|
} else {
|
||||||
|
Log.d(Constants.TAG, "uri: " + mDataUri);
|
||||||
|
|
||||||
|
try {
|
||||||
|
Uri secretUri = KeyRings.buildUnifiedKeyRingUri(mDataUri);
|
||||||
|
WrappedSecretKeyRing keyRing = new ProviderHelper(this).getWrappedSecretKeyRing(secretUri);
|
||||||
|
|
||||||
|
mMasterCanSign = keyRing.getSubKey().canCertify();
|
||||||
|
for (WrappedSecretKey key : keyRing.secretKeyIterator()) {
|
||||||
|
// Turn into uncached instance
|
||||||
|
mKeys.add(key.getUncached());
|
||||||
|
mKeysUsages.add(key.getKeyUsage()); // get usage when view is created
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isSet = false;
|
||||||
|
for (String userId : keyRing.getSubKey().getUserIds()) {
|
||||||
|
Log.d(Constants.TAG, "Added userId " + userId);
|
||||||
|
if (!isSet) {
|
||||||
|
isSet = true;
|
||||||
|
String[] parts = KeyRing.splitUserId(userId);
|
||||||
|
if (parts[0] != null) {
|
||||||
|
setTitle(parts[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mUserIds.add(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
buildLayout(false);
|
||||||
|
|
||||||
|
mCurrentPassphrase = "";
|
||||||
|
mIsPassphraseSet = keyRing.hasPassphrase();
|
||||||
|
if (!mIsPassphraseSet) {
|
||||||
|
// check "no passphrase" checkbox and remove button
|
||||||
|
mNoPassphrase.setChecked(true);
|
||||||
|
mChangePassphrase.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (ProviderHelper.NotFoundException e) {
|
||||||
|
Log.e(Constants.TAG, "Keyring not found: " + e.getMessage(), e);
|
||||||
|
Toast.makeText(this, R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows the dialog to set a new passphrase
|
||||||
|
*/
|
||||||
|
private void showSetPassphraseDialog() {
|
||||||
|
// 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();
|
||||||
|
|
||||||
|
// set new returned passphrase!
|
||||||
|
mNewPassphrase = data
|
||||||
|
.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE);
|
||||||
|
|
||||||
|
updatePassphraseButtonText();
|
||||||
|
somethingChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create a new Messenger for the communication back
|
||||||
|
Messenger messenger = new Messenger(returnHandler);
|
||||||
|
|
||||||
|
// set title based on isPassphraseSet()
|
||||||
|
int title;
|
||||||
|
if (isPassphraseSet()) {
|
||||||
|
title = R.string.title_change_passphrase;
|
||||||
|
} else {
|
||||||
|
title = R.string.title_set_passphrase;
|
||||||
|
}
|
||||||
|
|
||||||
|
SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance(
|
||||||
|
messenger, null, title);
|
||||||
|
|
||||||
|
setPassphraseDialog.show(getSupportFragmentManager(), "setPassphraseDialog");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build layout based on mUserId, mKeys and mKeysUsages Vectors. It creates Views for every user
|
||||||
|
* id and key.
|
||||||
|
*
|
||||||
|
* @param newKeys
|
||||||
|
*/
|
||||||
|
private void buildLayout(boolean newKeys) {
|
||||||
|
setContentView(R.layout.edit_key_activity);
|
||||||
|
|
||||||
|
// find views
|
||||||
|
mChangePassphrase = (Button) findViewById(R.id.edit_key_btn_change_passphrase);
|
||||||
|
mNoPassphrase = (CheckBox) findViewById(R.id.edit_key_no_passphrase);
|
||||||
|
// Build layout based on given userIds and keys
|
||||||
|
|
||||||
|
LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||||
|
|
||||||
|
LinearLayout container = (LinearLayout) findViewById(R.id.edit_key_container);
|
||||||
|
if (mIsPassphraseSet) {
|
||||||
|
mChangePassphrase.setText(getString(R.string.btn_change_passphrase));
|
||||||
|
}
|
||||||
|
mUserIdsView = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
|
||||||
|
mUserIdsView.setType(SectionView.TYPE_USER_ID);
|
||||||
|
mUserIdsView.setCanBeEdited(mMasterCanSign);
|
||||||
|
mUserIdsView.setUserIds(mUserIds);
|
||||||
|
mUserIdsView.setEditorListener(this);
|
||||||
|
container.addView(mUserIdsView);
|
||||||
|
mKeysView = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
|
||||||
|
mKeysView.setType(SectionView.TYPE_KEY);
|
||||||
|
mKeysView.setCanBeEdited(mMasterCanSign);
|
||||||
|
mKeysView.setKeys(mKeys, mKeysUsages, newKeys);
|
||||||
|
mKeysView.setEditorListener(this);
|
||||||
|
container.addView(mKeysView);
|
||||||
|
|
||||||
|
updatePassphraseButtonText();
|
||||||
|
|
||||||
|
mChangePassphrase.setOnClickListener(new OnClickListener() {
|
||||||
|
public void onClick(View v) {
|
||||||
|
showSetPassphraseDialog();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// disable passphrase when no passphrase checkbox is checked!
|
||||||
|
mNoPassphrase.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
if (isChecked) {
|
||||||
|
// remove passphrase
|
||||||
|
mSavedNewPassphrase = mNewPassphrase;
|
||||||
|
mNewPassphrase = "";
|
||||||
|
mChangePassphrase.setVisibility(View.GONE);
|
||||||
|
} else {
|
||||||
|
mNewPassphrase = mSavedNewPassphrase;
|
||||||
|
mChangePassphrase.setVisibility(View.VISIBLE);
|
||||||
|
}
|
||||||
|
somethingChanged();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private long getMasterKeyId() {
|
||||||
|
if (mKeysView.getEditors().getChildCount() == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return ((KeyEditor) mKeysView.getEditors().getChildAt(0)).getValue().getKeyId();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isPassphraseSet() {
|
||||||
|
if (mNoPassphrase.isChecked()) {
|
||||||
|
return true;
|
||||||
|
} else if ((mIsPassphraseSet)
|
||||||
|
|| (mNewPassphrase != null && !mNewPassphrase.equals(""))) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasPassphraseChanged() {
|
||||||
|
if (mNoPassphrase != null) {
|
||||||
|
if (mNoPassphrase.isChecked()) {
|
||||||
|
return mIsPassphraseSet;
|
||||||
|
} else {
|
||||||
|
return (mNewPassphrase != null && !mNewPassphrase.equals(""));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveClicked() {
|
||||||
|
final long masterKeyId = getMasterKeyId();
|
||||||
|
if (needsSaving()) { //make sure, as some versions don't support invalidateOptionsMenu
|
||||||
|
try {
|
||||||
|
if (!isPassphraseSet()) {
|
||||||
|
throw new PgpGeneralException(this.getString(R.string.set_a_passphrase));
|
||||||
|
}
|
||||||
|
|
||||||
|
String passphrase;
|
||||||
|
if (mIsPassphraseSet) {
|
||||||
|
passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
|
||||||
|
} else {
|
||||||
|
passphrase = "";
|
||||||
|
}
|
||||||
|
if (passphrase == null) {
|
||||||
|
PassphraseDialogFragment.show(this, masterKeyId,
|
||||||
|
new Handler() {
|
||||||
|
@Override
|
||||||
|
public void handleMessage(Message message) {
|
||||||
|
if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
|
||||||
|
mCurrentPassphrase = PassphraseCacheService.getCachedPassphrase(
|
||||||
|
EditKeyActivityOld.this, masterKeyId);
|
||||||
|
checkEmptyIDsWanted();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
mCurrentPassphrase = passphrase;
|
||||||
|
checkEmptyIDsWanted();
|
||||||
|
}
|
||||||
|
} catch (PgpGeneralException e) {
|
||||||
|
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
|
||||||
|
AppMsg.STYLE_ALERT).show();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
AppMsg.makeText(this, R.string.error_change_something_first, AppMsg.STYLE_ALERT).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkEmptyIDsWanted() {
|
||||||
|
try {
|
||||||
|
ArrayList<String> userIDs = getUserIds(mUserIdsView);
|
||||||
|
List<Boolean> newIDs = mUserIdsView.getNewIDFlags();
|
||||||
|
ArrayList<String> originalIDs = mUserIdsView.getOriginalIDs();
|
||||||
|
int curID = 0;
|
||||||
|
for (String userID : userIDs) {
|
||||||
|
if (userID.equals("") && (!userID.equals(originalIDs.get(curID)) || newIDs.get(curID))) {
|
||||||
|
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(
|
||||||
|
EditKeyActivityOld.this);
|
||||||
|
|
||||||
|
alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
|
||||||
|
alert.setTitle(R.string.warning);
|
||||||
|
alert.setMessage(EditKeyActivityOld.this.getString(R.string.ask_empty_id_ok));
|
||||||
|
|
||||||
|
alert.setPositiveButton(EditKeyActivityOld.this.getString(android.R.string.yes),
|
||||||
|
new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
|
dialog.dismiss();
|
||||||
|
finallySaveClicked();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
alert.setNegativeButton(this.getString(android.R.string.no),
|
||||||
|
new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
|
dialog.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
alert.setCancelable(false);
|
||||||
|
alert.show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
curID++;
|
||||||
|
}
|
||||||
|
} catch (PgpGeneralException e) {
|
||||||
|
Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
|
||||||
|
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()), AppMsg.STYLE_ALERT).show();
|
||||||
|
}
|
||||||
|
finallySaveClicked();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean[] toPrimitiveArray(final List<Boolean> booleanList) {
|
||||||
|
final boolean[] primitives = new boolean[booleanList.size()];
|
||||||
|
int index = 0;
|
||||||
|
for (Boolean object : booleanList) {
|
||||||
|
primitives[index++] = object;
|
||||||
|
}
|
||||||
|
return primitives;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void finallySaveClicked() {
|
||||||
|
/*
|
||||||
|
try {
|
||||||
|
// Send all information needed to service to edit key in other thread
|
||||||
|
Intent intent = new Intent(this, KeychainIntentService.class);
|
||||||
|
|
||||||
|
intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING);
|
||||||
|
|
||||||
|
OldSaveKeyringParcel saveParams = new OldSaveKeyringParcel();
|
||||||
|
saveParams.userIds = getUserIds(mUserIdsView);
|
||||||
|
saveParams.originalIDs = mUserIdsView.getOriginalIDs();
|
||||||
|
saveParams.deletedIDs = mUserIdsView.getDeletedIDs();
|
||||||
|
saveParams.newIDs = toPrimitiveArray(mUserIdsView.getNewIDFlags());
|
||||||
|
saveParams.primaryIDChanged = mUserIdsView.primaryChanged();
|
||||||
|
saveParams.moddedKeys = toPrimitiveArray(mKeysView.getNeedsSavingArray());
|
||||||
|
saveParams.deletedKeys = mKeysView.getDeletedKeys();
|
||||||
|
saveParams.keysExpiryDates = getKeysExpiryDates(mKeysView);
|
||||||
|
saveParams.keysUsages = getKeysUsages(mKeysView);
|
||||||
|
saveParams.newPassphrase = mNewPassphrase;
|
||||||
|
saveParams.oldPassphrase = mCurrentPassphrase;
|
||||||
|
saveParams.newKeys = toPrimitiveArray(mKeysView.getNewKeysArray());
|
||||||
|
saveParams.keys = getKeys(mKeysView);
|
||||||
|
saveParams.originalPrimaryID = mUserIdsView.getOriginalPrimaryID();
|
||||||
|
|
||||||
|
// fill values for this action
|
||||||
|
Bundle data = new Bundle();
|
||||||
|
data.putBoolean(KeychainIntentService.SAVE_KEYRING_CAN_SIGN, mMasterCanSign);
|
||||||
|
data.putParcelable(KeychainIntentService.SAVE_KEYRING_PARCEL, saveParams);
|
||||||
|
|
||||||
|
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
||||||
|
|
||||||
|
// Message is received after saving is done in KeychainIntentService
|
||||||
|
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
|
||||||
|
getString(R.string.progress_saving), ProgressDialog.STYLE_HORIZONTAL) {
|
||||||
|
public void handleMessage(Message message) {
|
||||||
|
// handle messages by standard KeychainIntentServiceHandler first
|
||||||
|
super.handleMessage(message);
|
||||||
|
|
||||||
|
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
|
||||||
|
Intent data = new Intent();
|
||||||
|
|
||||||
|
// return uri pointing to new created key
|
||||||
|
Uri uri = KeyRings.buildGenericKeyRingUri(getMasterKeyId());
|
||||||
|
data.setData(uri);
|
||||||
|
|
||||||
|
setResult(RESULT_OK, data);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create a new Messenger for the communication back
|
||||||
|
Messenger messenger = new Messenger(saveHandler);
|
||||||
|
intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
||||||
|
|
||||||
|
saveHandler.showProgressDialog(this);
|
||||||
|
|
||||||
|
// start service with intent
|
||||||
|
startService(intent);
|
||||||
|
} catch (PgpGeneralException e) {
|
||||||
|
Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
|
||||||
|
AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
|
||||||
|
AppMsg.STYLE_ALERT).show();
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cancelClicked() {
|
||||||
|
if (needsSaving()) { //ask if we want to save
|
||||||
|
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(
|
||||||
|
EditKeyActivityOld.this);
|
||||||
|
|
||||||
|
alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
|
||||||
|
alert.setTitle(R.string.warning);
|
||||||
|
alert.setMessage(EditKeyActivityOld.this.getString(R.string.ask_save_changed_key));
|
||||||
|
|
||||||
|
alert.setPositiveButton(EditKeyActivityOld.this.getString(android.R.string.yes),
|
||||||
|
new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
|
dialog.dismiss();
|
||||||
|
saveClicked();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
alert.setNegativeButton(this.getString(android.R.string.no),
|
||||||
|
new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
|
dialog.dismiss();
|
||||||
|
setResult(RESULT_CANCELED);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
alert.setCancelable(false);
|
||||||
|
alert.show();
|
||||||
|
} else {
|
||||||
|
setResult(RESULT_CANCELED);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns user ids from the SectionView
|
||||||
|
*
|
||||||
|
* @param userIdsView
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private ArrayList<String> getUserIds(SectionView userIdsView) throws PgpGeneralException {
|
||||||
|
ArrayList<String> userIds = new ArrayList<String>();
|
||||||
|
|
||||||
|
ViewGroup userIdEditors = userIdsView.getEditors();
|
||||||
|
|
||||||
|
boolean gotMainUserId = false;
|
||||||
|
for (int i = 0; i < userIdEditors.getChildCount(); ++i) {
|
||||||
|
UserIdEditor editor = (UserIdEditor) userIdEditors.getChildAt(i);
|
||||||
|
String userId;
|
||||||
|
userId = editor.getValue();
|
||||||
|
|
||||||
|
if (editor.isMainUserId()) {
|
||||||
|
userIds.add(0, userId);
|
||||||
|
gotMainUserId = true;
|
||||||
|
} else {
|
||||||
|
userIds.add(userId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userIds.size() == 0) {
|
||||||
|
throw new PgpGeneralException(getString(R.string.error_key_needs_a_user_id));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!gotMainUserId) {
|
||||||
|
throw new PgpGeneralException(getString(R.string.error_main_user_id_must_not_be_empty));
|
||||||
|
}
|
||||||
|
|
||||||
|
return userIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns keys from the SectionView
|
||||||
|
*
|
||||||
|
* @param keysView
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private ArrayList<UncachedSecretKey> getKeys(SectionView keysView) throws PgpGeneralException {
|
||||||
|
ArrayList<UncachedSecretKey> keys = new ArrayList<UncachedSecretKey>();
|
||||||
|
|
||||||
|
ViewGroup keyEditors = keysView.getEditors();
|
||||||
|
|
||||||
|
if (keyEditors.getChildCount() == 0) {
|
||||||
|
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
||||||
|
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
||||||
|
keys.add(editor.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns usage selections of keys from the SectionView
|
||||||
|
*
|
||||||
|
* @param keysView
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private ArrayList<Integer> getKeysUsages(SectionView keysView) throws PgpGeneralException {
|
||||||
|
ArrayList<Integer> keysUsages = new ArrayList<Integer>();
|
||||||
|
|
||||||
|
ViewGroup keyEditors = keysView.getEditors();
|
||||||
|
|
||||||
|
if (keyEditors.getChildCount() == 0) {
|
||||||
|
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
||||||
|
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
||||||
|
keysUsages.add(editor.getUsage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return keysUsages;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArrayList<Calendar> getKeysExpiryDates(SectionView keysView) throws PgpGeneralException {
|
||||||
|
ArrayList<Calendar> keysExpiryDates = new ArrayList<Calendar>();
|
||||||
|
|
||||||
|
ViewGroup keyEditors = keysView.getEditors();
|
||||||
|
|
||||||
|
if (keyEditors.getChildCount() == 0) {
|
||||||
|
throw new PgpGeneralException(getString(R.string.error_key_needs_master_key));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < keyEditors.getChildCount(); ++i) {
|
||||||
|
KeyEditor editor = (KeyEditor) keyEditors.getChildAt(i);
|
||||||
|
keysExpiryDates.add(editor.getExpiryDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
return keysExpiryDates;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePassphraseButtonText() {
|
||||||
|
mChangePassphrase.setText(isPassphraseSet() ? getString(R.string.btn_change_passphrase)
|
||||||
|
: getString(R.string.btn_set_passphrase));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -47,7 +47,6 @@ import android.view.ViewGroup;
|
|||||||
import android.widget.AbsListView.MultiChoiceModeListener;
|
import android.widget.AbsListView.MultiChoiceModeListener;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
@ -59,7 +58,6 @@ import org.sufficientlysecure.keychain.Constants;
|
|||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
||||||
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData;
|
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||||
import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
|
import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
|
||||||
import org.sufficientlysecure.keychain.util.Highlighter;
|
import org.sufficientlysecure.keychain.util.Highlighter;
|
||||||
@ -106,10 +104,10 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
Intent intent = new Intent(getActivity(), EditKeyActivity.class);
|
Intent intent = new Intent(getActivity(), EditKeyActivityOld.class);
|
||||||
intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);
|
intent.setAction(EditKeyActivityOld.ACTION_CREATE_KEY);
|
||||||
intent.putExtra(EditKeyActivity.EXTRA_GENERATE_DEFAULT_KEYS, true);
|
intent.putExtra(EditKeyActivityOld.EXTRA_GENERATE_DEFAULT_KEYS, true);
|
||||||
intent.putExtra(EditKeyActivity.EXTRA_USER_IDS, ""); // show user id view
|
intent.putExtra(EditKeyActivityOld.EXTRA_USER_IDS, ""); // show user id view
|
||||||
startActivityForResult(intent, 0);
|
startActivityForResult(intent, 0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -49,7 +49,6 @@ public class ViewKeyMainFragment extends LoaderFragment implements
|
|||||||
public static final String ARG_DATA_URI = "uri";
|
public static final String ARG_DATA_URI = "uri";
|
||||||
|
|
||||||
private View mActionEdit;
|
private View mActionEdit;
|
||||||
private View mActionEditNew;
|
|
||||||
private View mActionEditDivider;
|
private View mActionEditDivider;
|
||||||
private View mActionEncrypt;
|
private View mActionEncrypt;
|
||||||
private View mActionCertify;
|
private View mActionCertify;
|
||||||
@ -74,7 +73,6 @@ public class ViewKeyMainFragment extends LoaderFragment implements
|
|||||||
|
|
||||||
mUserIds = (ListView) view.findViewById(R.id.view_key_user_ids);
|
mUserIds = (ListView) view.findViewById(R.id.view_key_user_ids);
|
||||||
mActionEdit = view.findViewById(R.id.view_key_action_edit);
|
mActionEdit = view.findViewById(R.id.view_key_action_edit);
|
||||||
mActionEditNew = view.findViewById(R.id.view_key_action_edit_new);
|
|
||||||
mActionEditDivider = view.findViewById(R.id.view_key_action_edit_divider);
|
mActionEditDivider = view.findViewById(R.id.view_key_action_edit_divider);
|
||||||
mActionEncrypt = view.findViewById(R.id.view_key_action_encrypt);
|
mActionEncrypt = view.findViewById(R.id.view_key_action_encrypt);
|
||||||
mActionCertify = view.findViewById(R.id.view_key_action_certify);
|
mActionCertify = view.findViewById(R.id.view_key_action_certify);
|
||||||
@ -118,11 +116,6 @@ public class ViewKeyMainFragment extends LoaderFragment implements
|
|||||||
editKey(mDataUri);
|
editKey(mDataUri);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
mActionEditNew.setOnClickListener(new View.OnClickListener() {
|
|
||||||
public void onClick(View view) {
|
|
||||||
editKeyNew(mDataUri);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mUserIdsAdapter = new UserIdsAdapter(getActivity(), null, 0);
|
mUserIdsAdapter = new UserIdsAdapter(getActivity(), null, 0);
|
||||||
mUserIds.setAdapter(mUserIdsAdapter);
|
mUserIds.setAdapter(mUserIdsAdapter);
|
||||||
@ -259,16 +252,9 @@ public class ViewKeyMainFragment extends LoaderFragment implements
|
|||||||
private void editKey(Uri dataUri) {
|
private void editKey(Uri dataUri) {
|
||||||
Intent editIntent = new Intent(getActivity(), EditKeyActivity.class);
|
Intent editIntent = new Intent(getActivity(), EditKeyActivity.class);
|
||||||
editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
|
editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
|
||||||
editIntent.setAction(EditKeyActivity.ACTION_EDIT_KEY);
|
// editIntent.setAction(EditKeyActivity.ACTION_EDIT_KEY);
|
||||||
startActivityForResult(editIntent, 0);
|
// startActivityForResult(editIntent, 0);
|
||||||
}
|
startActivity(editIntent);
|
||||||
|
|
||||||
private void editKeyNew(Uri dataUri) {
|
|
||||||
Intent editIntent = new Intent(getActivity(), EditKeyActivityNew.class);
|
|
||||||
// editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
|
|
||||||
editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
|
|
||||||
editIntent.setAction(EditKeyActivity.ACTION_EDIT_KEY);
|
|
||||||
startActivityForResult(editIntent, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,22 +74,6 @@
|
|||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:gravity="center_vertical" />
|
android:gravity="center_vertical" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/view_key_action_edit_new"
|
|
||||||
android:paddingLeft="8dp"
|
|
||||||
android:paddingRight="8dp"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
|
||||||
android:clickable="true"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="NEW EDIT"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:drawableRight="@drawable/ic_action_edit"
|
|
||||||
android:drawablePadding="8dp"
|
|
||||||
android:gravity="center_vertical" />
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/view_key_action_edit_divider"
|
android:id="@+id/view_key_action_edit_divider"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user