1 files changed, 19 insertions, 25 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
index 465815f14..ae0206ab1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
@@ -32,16 +32,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
-import org.spongycastle.bcpg.SignatureSubpacket;
-import org.spongycastle.bcpg.SignatureSubpacketTags;
-import org.spongycastle.bcpg.sig.RevocationReason;
-import org.spongycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.WrappedPublicKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
+import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
@@ -144,23 +139,25 @@ public class ViewCertActivity extends ActionBarActivity
                 mCertifierUid.setText(R.string.unknown_uid);
             }
 
-            PGPSignature sig = PgpConversionHelper.BytesToPGPSignature(data.getBlob(INDEX_DATA));
+            WrappedSignature sig = WrappedSignature.fromBytes(data.getBlob(INDEX_DATA));
             try {
                 ProviderHelper providerHelper = new ProviderHelper(this);
 
-                WrappedPublicKeyRing signeeRing = providerHelper.getWrappedPublicKeyRing(data.getLong(INDEX_MASTER_KEY_ID));
-                WrappedPublicKeyRing signerRing = providerHelper.getWrappedPublicKeyRing(sig.getKeyID());
+                WrappedPublicKeyRing signeeRing =
+                        providerHelper.getWrappedPublicKeyRing(data.getLong(INDEX_MASTER_KEY_ID));
+                WrappedPublicKeyRing signerRing =
+                        providerHelper.getWrappedPublicKeyRing(sig.getKeyId());
 
                 try {
-                    signerRing.getSubkey().initSignature(sig);
-                    if (signeeRing.getSubkey().verifySignature(sig, signeeUid)) {
+                    sig.init(signerRing.getSubkey());
+                    if (sig.verifySignature(signeeRing.getSubkey(), signeeUid)) {
                         mStatus.setText(R.string.cert_verify_ok);
                         mStatus.setTextColor(getResources().getColor(R.color.bbutton_success));
                     } else {
                         mStatus.setText(R.string.cert_verify_failed);
                         mStatus.setTextColor(getResources().getColor(R.color.alert));
                     }
-                } catch (PGPException e) {
+                } catch (PgpGeneralException e) {
                     mStatus.setText(R.string.cert_verify_error);
                     mStatus.setTextColor(getResources().getColor(R.color.alert));
                 }
@@ -174,29 +171,26 @@ public class ViewCertActivity extends ActionBarActivity
 
             mRowReason.setVisibility(View.GONE);
             switch (data.getInt(INDEX_TYPE)) {
-                case PGPSignature.DEFAULT_CERTIFICATION:
+                case WrappedSignature.DEFAULT_CERTIFICATION:
                     mType.setText(R.string.cert_default);
                     break;
-                case PGPSignature.NO_CERTIFICATION:
+                case WrappedSignature.NO_CERTIFICATION:
                     mType.setText(R.string.cert_none);
                     break;
-                case PGPSignature.CASUAL_CERTIFICATION:
+                case WrappedSignature.CASUAL_CERTIFICATION:
                     mType.setText(R.string.cert_casual);
                     break;
-                case PGPSignature.POSITIVE_CERTIFICATION:
+                case WrappedSignature.POSITIVE_CERTIFICATION:
                     mType.setText(R.string.cert_positive);
                     break;
-                case PGPSignature.CERTIFICATION_REVOCATION: {
+                case WrappedSignature.CERTIFICATION_REVOCATION: {
                     mType.setText(R.string.cert_revoke);
-                    if (sig.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.REVOCATION_REASON)) {
-                        SignatureSubpacket p = sig.getHashedSubPackets().getSubpacket(
-                                SignatureSubpacketTags.REVOCATION_REASON);
-                        // For some reason, this is missing in SignatureSubpacketInputStream:146
-                        if (!(p instanceof RevocationReason)) {
-                            p = new RevocationReason(false, p.getData());
+                    if (sig.isRevocation()) {
+                        try {
+                            mReason.setText(sig.getRevocationReason());
+                        } catch(PgpGeneralException e) {
+                            mReason.setText(R.string.none);
                         }
-                        String reason = ((RevocationReason) p).getRevocationDescription();
-                        mReason.setText(reason);
                         mRowReason.setVisibility(View.VISIBLE);
                     }
                     break;