diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 9a18fc5f0..6fa380357 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -20,7 +20,7 @@ package org.sufficientlysecure.keychain.pgp; import android.webkit.MimeTypeMap; -import org.openintents.openpgp.OpenPgpDecryptMetadata; +import org.openintents.openpgp.OpenPgpMetadata; import org.spongycastle.bcpg.ArmoredInputStream; import org.spongycastle.openpgp.PGPCompressedData; import org.spongycastle.openpgp.PGPEncryptedData; @@ -485,7 +485,7 @@ public class PgpDecryptVerify { } } - OpenPgpDecryptMetadata metadata = new OpenPgpDecryptMetadata( + OpenPgpMetadata metadata = new OpenPgpMetadata( originalFilename, mimeType, literalData.getModificationTime().getTime(), diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java index d16c6ecc0..506f48c52 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java @@ -20,7 +20,7 @@ package org.sufficientlysecure.keychain.pgp; import android.os.Parcel; import android.os.Parcelable; -import org.openintents.openpgp.OpenPgpDecryptMetadata; +import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; public class PgpDecryptVerifyResult implements Parcelable { @@ -32,7 +32,7 @@ public class PgpDecryptVerifyResult implements Parcelable { long mKeyIdPassphraseNeeded; OpenPgpSignatureResult mSignatureResult; - OpenPgpDecryptMetadata mDecryptMetadata; + OpenPgpMetadata mDecryptMetadata; public int getStatus() { return mStatus; @@ -58,11 +58,11 @@ public class PgpDecryptVerifyResult implements Parcelable { mSignatureResult = signatureResult; } - public OpenPgpDecryptMetadata getDecryptMetadata() { + public OpenPgpMetadata getDecryptMetadata() { return mDecryptMetadata; } - public void setDecryptMetadata(OpenPgpDecryptMetadata decryptMetadata) { + public void setDecryptMetadata(OpenPgpMetadata decryptMetadata) { mDecryptMetadata = decryptMetadata; } @@ -95,7 +95,7 @@ public class PgpDecryptVerifyResult implements Parcelable { vr.mStatus = source.readInt(); vr.mKeyIdPassphraseNeeded = source.readLong(); vr.mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader()); - vr.mDecryptMetadata = source.readParcelable(OpenPgpDecryptMetadata.class.getClassLoader()); + vr.mDecryptMetadata = source.readParcelable(OpenPgpMetadata.class.getClassLoader()); return vr; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 5c94f4796..365401584 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -25,7 +25,7 @@ import android.os.IBinder; import android.os.ParcelFileDescriptor; import org.openintents.openpgp.IOpenPgpService; -import org.openintents.openpgp.OpenPgpDecryptMetadata; +import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.util.OpenPgpApi; @@ -406,7 +406,7 @@ public class OpenPgpService extends RemoteService { } } - OpenPgpDecryptMetadata metadata = decryptVerifyResult.getDecryptMetadata(); + OpenPgpMetadata metadata = decryptVerifyResult.getDecryptMetadata(); if (metadata != null) { result.putExtra(OpenPgpApi.RESULT_METADATA, metadata); } diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 9aa5f23788f19689fb172fd209de72bc6941afd +Subproject 777d22d75da9bfecf0bcfe2088da3fef01b2259 |