diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
commit | d090d4d332c9b1f5174890de531e2cc6936c038b (patch) | |
tree | 0ab75b52d12bfb464c0588a1f4a09b2d595b7113 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | b78a564de3d8c3771d2e8ae445e0a43b026531ab (diff) | |
download | open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.gz open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.bz2 open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.zip |
work on lookup key, fix some illegal state exceptions with hack
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service')
3 files changed, 11 insertions, 8 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index ddb53736a..870e45ea5 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -123,7 +123,6 @@ public class KeychainIntentService extends IntentService implements ProgressDial public static final String DECRYPT_RETURN_BYTES = "return_binary"; public static final String DECRYPT_CIPHERTEXT_BYTES = "ciphertext_bytes"; public static final String DECRYPT_ASSUME_SYMMETRIC = "assume_symmetric"; - public static final String DECRYPT_LOOKUP_UNKNOWN_KEY = "lookup_unknownKey"; // save keyring public static final String SAVE_KEYRING_NEW_PASSPHRASE = "new_passphrase"; @@ -188,7 +187,6 @@ public class KeychainIntentService extends IntentService implements ProgressDial public static final String RESULT_SIGNATURE_SUCCESS = "signature_success"; public static final String RESULT_SIGNATURE_UNKNOWN = "signature_unknown"; - public static final String RESULT_SIGNATURE_LOOKUP_KEY = "lookup_key"; // import public static final String RESULT_IMPORT_ADDED = "added"; @@ -395,8 +393,6 @@ public class KeychainIntentService extends IntentService implements ProgressDial boolean returnBytes = data.getBoolean(DECRYPT_RETURN_BYTES); boolean assumeSymmetricEncryption = data.getBoolean(DECRYPT_ASSUME_SYMMETRIC); - boolean lookupUnknownKey = data.getBoolean(DECRYPT_LOOKUP_UNKNOWN_KEY); - InputStream inStream = null; long inLength = -1; InputData inputData = null; @@ -472,7 +468,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial // verification of signatures PgpOperation operation = new PgpOperation(this, this, inputData, outStream); if (signedOnly) { - resultData = operation.verifyText(lookupUnknownKey); + resultData = operation.verifyText(); } else { resultData = operation.decryptAndVerify( PassphraseCacheService.getCachedPassphrase(this, secretKeyId), diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java index 5a338c757..a9ec291e3 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java @@ -25,6 +25,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; import android.widget.Toast; public class KeychainIntentServiceHandler extends Handler { @@ -60,7 +61,14 @@ public class KeychainIntentServiceHandler extends Handler { } public void showProgressDialog(FragmentActivity activity) { - mProgressDialogFragment.show(activity.getSupportFragmentManager(), "progressDialog"); + // TODO: THis is a hack!, see http://stackoverflow.com/questions/10114324/show-dialogfragment-from-onactivityresult + final FragmentManager manager = activity.getSupportFragmentManager(); + Handler handler = new Handler(); + handler.post(new Runnable() { + public void run() { + mProgressDialogFragment.show(manager, "progressDialog"); + } + }); } @Override diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index 575f76a22..6db091ed0 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -420,8 +420,7 @@ public class OpenPgpService extends RemoteService { Bundle outputBundle; PgpOperation operation = new PgpOperation(getContext(), null, inputData, outputStream); if (signedOnly) { - // TODO: download missing keys from keyserver? - outputBundle = operation.verifyText(false); + outputBundle = operation.verifyText(); } else { outputBundle = operation.decryptAndVerify(passphrase, false); } |