cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1617 from fiaxh/sign_key_id_type

Browse Source 
Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID
This commit is contained in:
Dominik Schürmann
2015-12-03 11:42:20 +01:00
parent cb1527e2a1 a0b46b0d3b
commit ab66c68771
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@@ -151,9 +151,9 @@ public final class Constants {
} }
public static final class key { public static final class key {
public static final int none = 0; public static final long none = 0;
public static final int symmetric = -1; public static final long symmetric = -1;
public static final int backup_code = -2; public static final long backup_code = -2;
} }
} }

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java
View File

@@ -68,8 +68,7 @@ public class SelectSignKeyIdActivity extends BaseActivity {
noneButton.setOnClickListener(new View.OnClickListener() { noneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// 0 is "none" mData.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, Constants.key.none);
mData.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0);
setResult(Activity.RESULT_OK, mData); setResult(Activity.RESULT_OK, mData);
finish(); finish();