moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-17 07:30:14 -05:00
Code Issues Releases Wiki Activity

fixes for lookup key

Browse Source
This commit is contained in:
Dominik 2012-09-08 23:09:38 +02:00
parent 20cefec4df
commit f5f2cbb2ea
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
View File

@ -37,10 +37,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -752,7 +749,8 @@ public class DecryptActivity extends SherlockFragmentActivity {
Bundle returnData = message.getData(); Bundle returnData = message.getData();
// if key is unknown show lookup dialog // 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 mUnknownSignatureKeyId = returnData
.getLong(ApgService.RESULT_SIGNATURE_KEY_ID); .getLong(ApgService.RESULT_SIGNATURE_KEY_ID);
lookupUnknownKey(mUnknownSignatureKeyId); lookupUnknownKey(mUnknownSignatureKeyId);
@ -879,6 +877,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
// this request is returned after LookupUnknownKeyDialogFragment started // this request is returned after LookupUnknownKeyDialogFragment started
// KeyServerQueryActivity and user looked uo key // KeyServerQueryActivity and user looked uo key
case Id.request.look_up_key_id: { case Id.request.look_up_key_id: {
Log.d(Constants.TAG, "Returning from Lookup Key...");
// decrypt again without lookup // decrypt again without lookup
mLookupUnknownKey = false; mLookupUnknownKey = false;
decryptStart(); decryptStart();