aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/thialfihar/android/apg/DecryptActivity.java
diff options
context:
space:
mode:
authorMarkus Doits <markus.doits@googlemail.com>2011-11-03 22:15:31 +0100
committerMarkus Doits <markus.doits@googlemail.com>2011-11-03 22:15:31 +0100
commit8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b (patch)
treeb73be883a93dfd381686c4dbb03e77d8f2ebf2f3 /src/org/thialfihar/android/apg/DecryptActivity.java
parente6c86a88922cfc6570d2c96067155c958aa02ee2 (diff)
downloadopen-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.tar.gz
open-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.tar.bz2
open-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.zip
Switch to spongycastle
https://github.com/rtyley/spongycastle It replaces bouncycastle2. Looks like a cleaner and better integration. A precompiled .jar ist in the "lib/"-dir.
Diffstat (limited to 'src/org/thialfihar/android/apg/DecryptActivity.java')
-rw-r--r--src/org/thialfihar/android/apg/DecryptActivity.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java
index 576b6d531..dfa4cb69b 100644
--- a/src/org/thialfihar/android/apg/DecryptActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptActivity.java
@@ -16,19 +16,9 @@
package org.thialfihar.android.apg;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.Security;
-import java.security.SignatureException;
-import java.util.regex.Matcher;
-
-import org.bouncycastle2.jce.provider.BouncyCastleProvider;
-import org.bouncycastle2.openpgp.PGPException;
-import org.bouncycastle2.openpgp.PGPPublicKeyRing;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.openpgp.PGPException;
+import org.spongycastle.openpgp.PGPPublicKeyRing;
import org.thialfihar.android.apg.provider.DataProvider;
import android.app.AlertDialog;
@@ -53,6 +43,16 @@ import android.widget.TextView;
import android.widget.Toast;
import android.widget.ViewFlipper;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.Security;
+import java.security.SignatureException;
+import java.util.regex.Matcher;
+
public class DecryptActivity extends BaseActivity {
private long mSignatureKeyId = 0;