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

Fix nullpointer in DecryptActivity

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-29 23:05:17 +02:00
parent 7531106565
commit 9e7c9a0d32
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ public class DecryptActivity extends DrawerActivity {
final String clipboardText = final String clipboardText =
ClipboardReflection.getClipboardText(DecryptActivity.this).toString(); ClipboardReflection.getClipboardText(DecryptActivity.this).toString();
new AsyncTask<Void,Void,Boolean>() { AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() {
@Override @Override
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(Void... params) {
@@ -88,7 +88,7 @@ public class DecryptActivity extends DrawerActivity {
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);
animate = matcher.matches(); animate = matcher.matches();
} }
@@ -100,11 +100,15 @@ public class DecryptActivity extends DrawerActivity {
super.onPostExecute(animate); super.onPostExecute(animate);
// if so, animate the clipboard icon just a bit~ // if so, animate the clipboard icon just a bit~
if(animate) { if (animate) {
SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start();
} }
} }
}.execute(); };
if (clipboardText != null) {
tadaTask.execute();
}
} }
} }