diff options
| author | fiaxh <github@lightrise.org> | 2015-12-03 09:20:34 +0000 |
|---|---|---|
| committer | fiaxh <github@lightrise.org> | 2015-12-03 09:24:19 +0000 |
| commit | a0b46b0d3b7dd201568d1f236cb25b0a794fc2c2 (patch) | |
| tree | 94104a7e04e786bc5dc94f42c27a96383a8926b0 | |
| parent | cb1527e2a1a790455b4d2e2041ed07accbe3c80f (diff) | |
| download | open-keychain-a0b46b0d3b7dd201568d1f236cb25b0a794fc2c2.tar.gz open-keychain-a0b46b0d3b7dd201568d1f236cb25b0a794fc2c2.tar.bz2 open-keychain-a0b46b0d3b7dd201568d1f236cb25b0a794fc2c2.zip | |
Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 69f1862ce..2de1cb38b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -151,9 +151,9 @@ public final class Constants { } public static final class key { - public static final int none = 0; - public static final int symmetric = -1; - public static final int backup_code = -2; + public static final long none = 0; + public static final long symmetric = -1; + public static final long backup_code = -2; } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java index bed49a6f6..fd3f8f731 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java @@ -68,8 +68,7 @@ public class SelectSignKeyIdActivity extends BaseActivity { noneButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // 0 is "none" - mData.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0); + mData.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, Constants.key.none); setResult(Activity.RESULT_OK, mData); finish(); |