diff options
4 files changed, 12 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml new file mode 100644 index 000000000..a10d1e2fa --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_list_public_multi_delete" + android:icon="@android:drawable/ic_menu_delete" + android:title="@string/menu_delete_key"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java index d281d1559..023c8fd9d 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java @@ -20,14 +20,13 @@ package org.sufficientlysecure.keychain.ui; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.helper.ActionBarHelper; - -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import android.content.Intent; import android.os.Bundle; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; + public class KeyListPublicActivity extends KeyActivity { @Override @@ -59,7 +58,6 @@ public class KeyListPublicActivity extends KeyActivity { return true; case R.id.menu_key_list_public_import: Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class); - intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY); startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code); return true; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java index b5ca0269d..3ce1d08d0 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java @@ -92,7 +92,6 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte @Override public void onClick(View v) { Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class); - intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY); startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code); } }); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java index 4db20e6b7..d95f03ae1 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java @@ -71,7 +71,6 @@ public class KeyListSecretActivity extends KeyActivity { return true; case R.id.menu_key_list_secret_import: Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class); - intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY); startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code); return true; |