aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java131
1 files changed, 33 insertions, 98 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 9427ce0db..72ea4c013 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -20,8 +20,6 @@ package org.sufficientlysecure.keychain.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
-import android.database.Cursor;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Message;
import android.os.Messenger;
@@ -35,18 +33,18 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.util.Log;
-import java.util.ArrayList;
+import java.util.HashMap;
public class DeleteKeyDialogFragment extends DialogFragment {
private static final String ARG_MESSENGER = "messenger";
- private static final String ARG_DELETE_KEY_RING_ROW_IDS = "delete_key_ring_row_ids";
+ private static final String ARG_DELETE_MASTER_KEY_IDS = "delete_master_key_ids";
public static final int MESSAGE_OKAY = 1;
public static final int MESSAGE_ERROR = 0;
@@ -63,13 +61,13 @@ public class DeleteKeyDialogFragment extends DialogFragment {
/**
* Creates new instance of this delete file dialog fragment
*/
- public static DeleteKeyDialogFragment newInstance(Messenger messenger, long[] keyRingRowIds
- ) {
+ public static DeleteKeyDialogFragment newInstance(Messenger messenger,
+ long[] masterKeyIds) {
DeleteKeyDialogFragment frag = new DeleteKeyDialogFragment();
Bundle args = new Bundle();
args.putParcelable(ARG_MESSENGER, messenger);
- args.putLongArray(ARG_DELETE_KEY_RING_ROW_IDS, keyRingRowIds);
+ args.putLongArray(ARG_DELETE_MASTER_KEY_IDS, masterKeyIds);
//We don't need the key type
frag.setArguments(args);
@@ -77,14 +75,13 @@ public class DeleteKeyDialogFragment extends DialogFragment {
return frag;
}
-
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
mMessenger = getArguments().getParcelable(ARG_MESSENGER);
- final long[] keyRingRowIds = getArguments().getLongArray(ARG_DELETE_KEY_RING_ROW_IDS);
+ final long[] masterKeyIds = getArguments().getLongArray(ARG_DELETE_MASTER_KEY_IDS);
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -98,112 +95,50 @@ public class DeleteKeyDialogFragment extends DialogFragment {
mCheckDeleteSecret = (CheckBox) mInflateView.findViewById(R.id.checkDeleteSecret);
builder.setTitle(R.string.warning);
- /* TODO! redo
- //If only a single key has been selected
- if (keyRingRowIds.length == 1) {
- Uri dataUri;
- ArrayList<Long> publicKeyRings; //Any one will do
+ // If only a single key has been selected
+ if (masterKeyIds.length == 1) {
mIsSingleSelection = true;
- long selectedRow = keyRingRowIds[0];
- long keyType;
- publicKeyRings = ProviderHelper.getPublicKeyRingsRowIds(activity);
-
- if (publicKeyRings.contains(selectedRow)) {
- //TODO Should be a better method to do this other than getting all the KeyRings
- dataUri = KeychainContract.KeyRings.buildPublicKeyRingsUri(String.valueOf(selectedRow));
- keyType = Id.type.public_key;
- } else {
- dataUri = KeychainContract.KeyRings.buildSecretKeyRingsUri(String.valueOf(selectedRow));
- keyType = Id.type.secret_key;
- }
+ long masterKeyId = masterKeyIds[0];
+
+ HashMap<String, Object> data = ProviderHelper.getUnifiedData(activity, masterKeyId, new String[]{
+ KeyRings.USER_ID,
+ KeyRings.HAS_SECRET
+ }, new int[] { ProviderHelper.FIELD_TYPE_STRING, ProviderHelper.FIELD_TYPE_INTEGER });
+ String userId = (String) data.get(KeyRings.USER_ID);
+ boolean hasSecret = ((Long) data.get(KeyRings.HAS_SECRET)) == 1;
- String userId = ProviderHelper.getUserId(activity, dataUri);
- // Hide the Checkbox and TextView since this is a single selection,
- // user will be notified thru message
+ // Hide the Checkbox and TextView since this is a single selection,user will be notified through message
mDeleteSecretKeyView.setVisibility(View.GONE);
// Set message depending on which key it is.
- mMainMessage.setText(getString(keyType == Id.type.secret_key ?
- R.string.secret_key_deletion_confirmation :
- R.string.public_key_deletetion_confirmation, userId));
+ mMainMessage.setText(getString(
+ hasSecret ? R.string.secret_key_deletion_confirmation
+ : R.string.public_key_deletetion_confirmation,
+ userId));
} else {
mDeleteSecretKeyView.setVisibility(View.VISIBLE);
mMainMessage.setText(R.string.key_deletion_confirmation_multi);
}
-
builder.setIcon(R.drawable.ic_dialog_alert_holo_light);
builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Uri queryUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
- String[] projection = new String[]{
- KeychainContract.KeyRings.MASTER_KEY_ID, // 0
- KeychainContract.KeyRings.TYPE// 1
- };
-
- // make selection with all entries where _ID is one of the given row ids
- String selection = KeychainDatabase.Tables.KEY_RINGS + "." +
- KeychainContract.KeyRings._ID + " IN(";
- String selectionIDs = "";
- for (int i = 0; i < keyRingRowIds.length; i++) {
- selectionIDs += "'" + String.valueOf(keyRingRowIds[i]) + "'";
- if (i + 1 < keyRingRowIds.length) {
- selectionIDs += ",";
- }
- }
- selection += selectionIDs + ")";
-
- Cursor cursor = activity.getContentResolver().query(queryUri, projection,
- selection, null, null);
-
-
- long masterKeyId;
- long keyType;
- boolean isSuccessfullyDeleted;
- try {
- isSuccessfullyDeleted = false;
- while (cursor != null && cursor.moveToNext()) {
- masterKeyId = cursor.getLong(0);
- keyType = cursor.getLong(1);
-
- Log.d(Constants.TAG, "masterKeyId: " + masterKeyId +
- ", keyType:" +
- (keyType == KeychainContract.KeyTypes.PUBLIC ?
- "Public" : "Private"));
-
- if (keyType == KeychainContract.KeyTypes.SECRET) {
- if (mCheckDeleteSecret.isChecked() || mIsSingleSelection) {
- ProviderHelper.deleteUnifiedKeyRing(activity,
- String.valueOf(masterKeyId), true);
- }
- } else {
- ProviderHelper.deleteUnifiedKeyRing(activity,
- String.valueOf(masterKeyId), false);
- }
- }
-
- //Check if the selected rows have actually been deleted
- cursor = activity.getContentResolver().query(
- queryUri, projection, selection, null, null);
- if (cursor == null || cursor.getCount() == 0 ||
- !mCheckDeleteSecret.isChecked()) {
- isSuccessfullyDeleted = true;
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
- dismiss();
-
- if (isSuccessfullyDeleted) {
+ boolean success = false;
+ for(long masterKeyId : masterKeyIds) {
+ int count = activity.getContentResolver().delete(
+ KeyRingData.buildPublicKeyRingUri(Long.toString(masterKeyId)), null, null
+ );
+ success = count > 0;
+ }
+ if (success) {
sendMessageToHandler(MESSAGE_OKAY, null);
} else {
sendMessageToHandler(MESSAGE_ERROR, null);
}
+ dismiss();
}
});
builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@@ -213,7 +148,7 @@ public class DeleteKeyDialogFragment extends DialogFragment {
dismiss();
}
});
- */
+
return builder.create();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:30:45 +0000