diff options
5 files changed, 10 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 7789ca9c4..6001687a1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -84,17 +84,17 @@ public class DecryptActivity extends DrawerActivity { return; } - new AsyncTask<Void, Void, Boolean>() { + new AsyncTask<String, Void, Boolean>() { @Override - protected Boolean doInBackground(Void... params) { + protected Boolean doInBackground(String... clipboardText) { // see if it looks like a pgp thing - Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText); + Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText[0]); boolean animate = matcher.matches(); // see if it looks like another pgp thing if (!animate) { - matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); + matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText[0]); animate = matcher.matches(); } return animate; @@ -109,7 +109,7 @@ public class DecryptActivity extends DrawerActivity { SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); } } - }.execute(); + }.execute(clipboardText.toString()); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 31a307194..6f521efa2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -122,8 +122,7 @@ public abstract class DecryptFragment extends Fragment { if (userIdSplit[1] != null) { mUserIdRest.setText(userIdSplit[1]); } else { - mUserIdRest.setText(getString(R.string.label_key_id) + ": " - + KeyFormattingUtils.convertKeyIdToHex(mSignatureKeyId)); + mUserIdRest.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), mSignatureKeyId)); } switch (signatureResult.getStatus()) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java index 8d489b3d4..73163eabd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java @@ -156,11 +156,11 @@ public class DecryptTextActivity extends ActionBarActivity { } else if (ACTION_DECRYPT_FROM_CLIPBOARD.equals(action)) { Log.d(Constants.TAG, "ACTION_DECRYPT_FROM_CLIPBOARD"); - String clipboardText = ClipboardReflection.getClipboardText(this).toString(); - clipboardText = getPgpContent(clipboardText); + CharSequence clipboardText = ClipboardReflection.getClipboardText(this); if (clipboardText != null) { - loadFragment(savedInstanceState, clipboardText); + String text = getPgpContent(clipboardText.toString()); + loadFragment(savedInstanceState, text); } else { returnInvalidResult(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index 53e4e0fd6..6947fc1ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -128,7 +128,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter { } long masterKeyId = cursor.getLong(mIndexMasterKeyId); - h.keyId.setText(KeyFormattingUtils.convertKeyIdToHex(masterKeyId)); + h.keyId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId)); boolean enabled = true; if (cursor.getInt(mIndexRevoked) != 0) { diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange -Subproject d584614921600fabe2043d16acfefd55d4c00c8 +Subproject 5c48b928d0f250a9121a74690da86162467cc95 |