moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-10-03 04:25:08 +02:00
commit f456c8a17d
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@ -84,17 +84,17 @@ public class DecryptActivity extends DrawerActivity {
return; return;
} }
new AsyncTask<Void, Void, Boolean>() { new AsyncTask<String, Void, Boolean>() {
@Override @Override
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(String... clipboardText) {
// see if it looks like a pgp thing // 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(); boolean animate = matcher.matches();
// see if it looks like another pgp thing // see if it looks like another pgp thing
if (!animate) { if (!animate) {
matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText[0]);
animate = matcher.matches(); animate = matcher.matches();
} }
return animate; return animate;
@ -109,7 +109,7 @@ public class DecryptActivity extends DrawerActivity {
SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start();
} }
} }
}.execute(); }.execute(clipboardText.toString());
} }
} }

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

@ -122,8 +122,7 @@ public abstract class DecryptFragment extends Fragment {
if (userIdSplit[1] != null) { if (userIdSplit[1] != null) {
mUserIdRest.setText(userIdSplit[1]); mUserIdRest.setText(userIdSplit[1]);
} else { } else {
mUserIdRest.setText(getString(R.string.label_key_id) + ": " mUserIdRest.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), mSignatureKeyId));
+ KeyFormattingUtils.convertKeyIdToHex(mSignatureKeyId));
} }
switch (signatureResult.getStatus()) { switch (signatureResult.getStatus()) {

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

@ -156,11 +156,11 @@ public class DecryptTextActivity extends ActionBarActivity {
} else if (ACTION_DECRYPT_FROM_CLIPBOARD.equals(action)) { } else if (ACTION_DECRYPT_FROM_CLIPBOARD.equals(action)) {
Log.d(Constants.TAG, "ACTION_DECRYPT_FROM_CLIPBOARD"); Log.d(Constants.TAG, "ACTION_DECRYPT_FROM_CLIPBOARD");
String clipboardText = ClipboardReflection.getClipboardText(this).toString(); CharSequence clipboardText = ClipboardReflection.getClipboardText(this);
clipboardText = getPgpContent(clipboardText);
if (clipboardText != null) { if (clipboardText != null) {
loadFragment(savedInstanceState, clipboardText); String text = getPgpContent(clipboardText.toString());
loadFragment(savedInstanceState, text);
} else { } else {
returnInvalidResult(); returnInvalidResult();
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
View File

@ -128,7 +128,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
} }
long masterKeyId = cursor.getLong(mIndexMasterKeyId); long masterKeyId = cursor.getLong(mIndexMasterKeyId);
h.keyId.setText(KeyFormattingUtils.convertKeyIdToHex(masterKeyId)); h.keyId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId));
boolean enabled = true; boolean enabled = true;
if (cursor.getInt(mIndexRevoked) != 0) { if (cursor.getInt(mIndexRevoked) != 0) {

2
extern/safeslinger-exchange vendored

@ -1 +1 @@
Subproject commit d584614921600fabe2043d16acfefd55d4c00c8a Subproject commit 5c48b928d0f250a9121a74690da86162467cc956