From a0b46b0d3b7dd201568d1f236cb25b0a794fc2c2 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 3 Dec 2015 09:20:34 +0000 Subject: Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID --- .../src/main/java/org/sufficientlysecure/keychain/Constants.java | 6 +++--- .../keychain/remote/ui/SelectSignKeyIdActivity.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'OpenKeychain/src/main') 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(); -- cgit v1.2.3