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

fix nullpointer with subtle attention seeker

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-03 02:07:09 +02:00
parent 08bfc2ae73
commit 34e4dabea9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,10 +76,15 @@ public class DecryptActivity extends DrawerActivity {
if (Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) { if (Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
// get text from clipboard // get text from clipboard
final String clipboardText = final CharSequence clipboardText =
ClipboardReflection.getClipboardText(DecryptActivity.this).toString(); ClipboardReflection.getClipboardText(DecryptActivity.this);
AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() { // if it's null, nothing to do here /o/
if (clipboardText == null) {
return;
}
new AsyncTask<Void, Void, Boolean>() {
@Override @Override
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(Void... params) {
@@ -104,11 +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();
if (clipboardText != null) {
tadaTask.execute();
}
} }
} }