moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-13 20:35:10 -05:00
Code Issues Releases Wiki Activity

Update api lib

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-11 21:26:52 +02:00
parent 55d03f539e
commit acf5b99434
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@ -20,7 +20,7 @@ package org.sufficientlysecure.keychain.pgp;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import org.openintents.openpgp.OpenPgpDecryptMetadata; import org.openintents.openpgp.OpenPgpMetadata;
import org.spongycastle.bcpg.ArmoredInputStream; import org.spongycastle.bcpg.ArmoredInputStream;
import org.spongycastle.openpgp.PGPCompressedData; import org.spongycastle.openpgp.PGPCompressedData;
import org.spongycastle.openpgp.PGPEncryptedData; import org.spongycastle.openpgp.PGPEncryptedData;
@ -485,7 +485,7 @@ public class PgpDecryptVerify {
} }
} }
OpenPgpDecryptMetadata metadata = new OpenPgpDecryptMetadata( OpenPgpMetadata metadata = new OpenPgpMetadata(
originalFilename, originalFilename,
mimeType, mimeType,
literalData.getModificationTime().getTime(), literalData.getModificationTime().getTime(),

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
View File

@ -20,7 +20,7 @@ package org.sufficientlysecure.keychain.pgp;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import org.openintents.openpgp.OpenPgpDecryptMetadata; import org.openintents.openpgp.OpenPgpMetadata;
import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.OpenPgpSignatureResult;
public class PgpDecryptVerifyResult implements Parcelable { public class PgpDecryptVerifyResult implements Parcelable {
@ -32,7 +32,7 @@ public class PgpDecryptVerifyResult implements Parcelable {
long mKeyIdPassphraseNeeded; long mKeyIdPassphraseNeeded;
OpenPgpSignatureResult mSignatureResult; OpenPgpSignatureResult mSignatureResult;
OpenPgpDecryptMetadata mDecryptMetadata; OpenPgpMetadata mDecryptMetadata;
public int getStatus() { public int getStatus() {
return mStatus; return mStatus;
@ -58,11 +58,11 @@ public class PgpDecryptVerifyResult implements Parcelable {
mSignatureResult = signatureResult; mSignatureResult = signatureResult;
} }
public OpenPgpDecryptMetadata getDecryptMetadata() { public OpenPgpMetadata getDecryptMetadata() {
return mDecryptMetadata; return mDecryptMetadata;
} }
public void setDecryptMetadata(OpenPgpDecryptMetadata decryptMetadata) { public void setDecryptMetadata(OpenPgpMetadata decryptMetadata) {
mDecryptMetadata = decryptMetadata; mDecryptMetadata = decryptMetadata;
} }
@ -95,7 +95,7 @@ public class PgpDecryptVerifyResult implements Parcelable {
vr.mStatus = source.readInt(); vr.mStatus = source.readInt();
vr.mKeyIdPassphraseNeeded = source.readLong(); vr.mKeyIdPassphraseNeeded = source.readLong();
vr.mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader()); vr.mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader());
vr.mDecryptMetadata = source.readParcelable(OpenPgpDecryptMetadata.class.getClassLoader()); vr.mDecryptMetadata = source.readParcelable(OpenPgpMetadata.class.getClassLoader());
return vr; return vr;
} }

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@ -25,7 +25,7 @@ import android.os.IBinder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import org.openintents.openpgp.IOpenPgpService; import org.openintents.openpgp.IOpenPgpService;
import org.openintents.openpgp.OpenPgpDecryptMetadata; import org.openintents.openpgp.OpenPgpMetadata;
import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.OpenPgpSignatureResult;
import org.openintents.openpgp.util.OpenPgpApi; 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) { if (metadata != null) {
result.putExtra(OpenPgpApi.RESULT_METADATA, metadata); result.putExtra(OpenPgpApi.RESULT_METADATA, metadata);
} }

2
extern/openpgp-api-lib vendored

@ -1 +1 @@
Subproject commit 9aa5f23788f19689fb172fd209de72bc6941afdf Subproject commit 777d22d75da9bfecf0bcfe2088da3fef01b2259f