aboutsummaryrefslogtreecommitdiffstats
path: root/org_apg
diff options
context:
space:
mode:
authorDominik <dominik@dominikschuermann.de>2012-09-08 23:09:38 +0200
committerDominik <dominik@dominikschuermann.de>2012-09-08 23:09:38 +0200
commitf5f2cbb2ea39ed3a7322cead139888c3db4860ba (patch)
tree23c2bb9b488349d91fc00f36a7d43a96d3d96af4 /org_apg
parent20cefec4df9ab60c406f1132db504afd66d615c9 (diff)
downloadopen-keychain-f5f2cbb2ea39ed3a7322cead139888c3db4860ba.tar.gz
open-keychain-f5f2cbb2ea39ed3a7322cead139888c3db4860ba.tar.bz2
open-keychain-f5f2cbb2ea39ed3a7322cead139888c3db4860ba.zip
fixes for lookup key
Diffstat (limited to 'org_apg')
-rw-r--r--org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
index 71bb3d30a..ee6ad5af8 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
@@ -37,10 +37,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
-import android.app.AlertDialog;
-import android.app.Dialog;
import android.app.ProgressDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@@ -752,7 +749,8 @@ public class DecryptActivity extends SherlockFragmentActivity {
Bundle returnData = message.getData();
// if key is unknown show lookup dialog
- if (returnData.getBoolean(ApgService.RESULT_SIGNATURE_LOOKUP_KEY) && mLookupUnknownKey) {
+ if (returnData.getBoolean(ApgService.RESULT_SIGNATURE_LOOKUP_KEY)
+ && mLookupUnknownKey) {
mUnknownSignatureKeyId = returnData
.getLong(ApgService.RESULT_SIGNATURE_KEY_ID);
lookupUnknownKey(mUnknownSignatureKeyId);
@@ -879,6 +877,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
// this request is returned after LookupUnknownKeyDialogFragment started
// KeyServerQueryActivity and user looked uo key
case Id.request.look_up_key_id: {
+ Log.d(Constants.TAG, "Returning from Lookup Key...");
// decrypt again without lookup
mLookupUnknownKey = false;
decryptStart();