diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 19:20:08 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 19:20:08 +0200 |
commit | e46bc240793f03f3cd09684a0852e33af96b2e89 (patch) | |
tree | a5418bd164bd2e57369755a815fba958d6c64279 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java | |
parent | d483a8b73e01ab80d8f9098b46df797a7298a09e (diff) | |
download | open-keychain-e46bc240793f03f3cd09684a0852e33af96b2e89.tar.gz open-keychain-e46bc240793f03f3cd09684a0852e33af96b2e89.tar.bz2 open-keychain-e46bc240793f03f3cd09684a0852e33af96b2e89.zip |
add cancel support to edit key action
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index 69f4af04b..fbfa5ee08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -31,7 +31,6 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; -import org.spongycastle.bcpg.PublicKeyAlgorithmTags; import org.spongycastle.bcpg.sig.KeyFlags; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -126,7 +125,7 @@ public class CreateKeyFinalFragment extends Fragment { private void createKey() { Intent intent = new Intent(getActivity(), KeychainIntentService.class); - intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING); + intent.setAction(KeychainIntentService.ACTION_EDIT_KEYRING); KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( getActivity(), @@ -178,7 +177,7 @@ public class CreateKeyFinalFragment extends Fragment { parcel.mNewPassphrase = mPassphrase; // get selected key entries - data.putParcelable(KeychainIntentService.SAVE_KEYRING_PARCEL, parcel); + data.putParcelable(KeychainIntentService.EDIT_KEYRING_PARCEL, parcel); intent.putExtra(KeychainIntentService.EXTRA_DATA, data); |