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

Cleanup AsyncTask code for NFC

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-10 13:53:02 +02:00
parent b3a39d7c24
commit da4016d565
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -230,7 +230,7 @@ public class ViewKeyActivity extends ActionBarActivity {
// see http://www.lonestarprod.com/?p=34 // see http://www.lonestarprod.com/?p=34
if (content.length() >= 86389) { if (content.length() >= 86389) {
AppMsg.makeText(this, R.string.key_too_big_for_sharing, AppMsg.makeText(this, R.string.key_too_big_for_sharing,
AppMsg.STYLE_ALERT).show(); AppMsg.STYLE_ALERT).show();
return; return;
} }
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
@ -266,7 +266,7 @@ public class ViewKeyActivity extends ActionBarActivity {
ClipboardReflection.copyToClipboard(this, keyringArmored.get(0)); ClipboardReflection.copyToClipboard(this, keyringArmored.get(0));
AppMsg.makeText(this, R.string.key_copied_to_clipboard, AppMsg.STYLE_INFO) AppMsg.makeText(this, R.string.key_copied_to_clipboard, AppMsg.STYLE_INFO)
.show(); .show();
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
Log.e(Constants.TAG, "key not found!", e); Log.e(Constants.TAG, "key not found!", e);
} }
@ -351,9 +351,9 @@ public class ViewKeyActivity extends ActionBarActivity {
* mNfcKeyringBytes can not be retrieved in createNdefMessage, because this process * mNfcKeyringBytes can not be retrieved in createNdefMessage, because this process
* has no permissions to query the Uri. * has no permissions to query the Uri.
*/ */
AsyncTask<NfcAdapter, Void, Void> initTask = AsyncTask<Void, Void, Void> initTask =
new AsyncTask<NfcAdapter, Void, Void>() { new AsyncTask<Void, Void, Void>() {
protected Void doInBackground(NfcAdapter... adapter) { protected Void doInBackground(Void... unused) {
try { try {
Uri blobUri = Uri blobUri =
KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri); KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri);
@ -364,10 +364,12 @@ public class ViewKeyActivity extends ActionBarActivity {
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
Log.e(Constants.TAG, "key not found!", e); Log.e(Constants.TAG, "key not found!", e);
} }
// no AsyncTask return (Void)
return null; return null;
} }
protected void onPostExecute(Void result) { protected void onPostExecute(Void unused) {
// Register callback to set NDEF message // Register callback to set NDEF message
mNfcAdapter.setNdefPushMessageCallback(mNdefCallback mNfcAdapter.setNdefPushMessageCallback(mNdefCallback
, ViewKeyActivity.this); , ViewKeyActivity.this);