aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-05-29 15:58:50 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-05-29 15:58:50 +0200
commitf6fc6caa1c112ae79ec2fc436a7db2f81a12c6bf (patch)
tree768c210e9bc23abcdec9dac12d6f5baa65223f60 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain
parent438ccd480e316582617e834a22d0f4c2815aa26a (diff)
downloadopen-keychain-f6fc6caa1c112ae79ec2fc436a7db2f81a12c6bf.tar.gz
open-keychain-f6fc6caa1c112ae79ec2fc436a7db2f81a12c6bf.tar.bz2
open-keychain-f6fc6caa1c112ae79ec2fc436a7db2f81a12c6bf.zip
rename to openintents namespace
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 1a57a457d..a367c613f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+
+import org.openintents.crypto.CryptoError;
+import org.openintents.crypto.CryptoSignatureResult;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.helper.PgpMain;
@@ -29,10 +32,8 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
-import com.android.crypto.CryptoError;
-import com.android.crypto.ICryptoCallback;
-import com.android.crypto.ICryptoService;
-import com.android.crypto.CryptoSignatureResult;
+import org.openintents.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoService;
import android.app.Service;
import android.content.Context;
@@ -89,7 +90,8 @@ public class CryptoService extends Service {
// passphrase!
Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
- callback.onActivityRequired(intent);
+ // TODO: start activity bind to service from activity send back intent on success
+// callback.onActivityRequired(intent);
return;
}