cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API update

Browse Source
This commit is contained in:
Dominik Schürmann
2013-09-14 02:08:06 +02:00
parent a4ae976284
commit bf7fb08bca
12 changed files with 555 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpService.java
View File

@@ -461,19 +461,26 @@ public class OpenPgpService extends Service {
// get signature informations from bundle
boolean signature = outputBundle.getBoolean(KeychainIntentService.RESULT_SIGNATURE);
long signatureKeyId = outputBundle
.getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
String signatureUserId = outputBundle
.getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
boolean signatureSuccess = outputBundle
.getBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS);
boolean signatureUnknown = outputBundle
.getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN);
OpenPgpSignatureResult sigResult = null;
if (signature) {
sigResult = new OpenPgpSignatureResult(signatureUserId, signatureSuccess,
signatureUnknown);
long signatureKeyId = outputBundle
.getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
String signatureUserId = outputBundle
.getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
boolean signatureSuccess = outputBundle
.getBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS);
boolean signatureUnknown = outputBundle
.getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN);
int signatureStatus = OpenPgpSignatureResult.SIGNATURE_ERROR;
if (signatureSuccess) {
signatureStatus = OpenPgpSignatureResult.SIGNATURE_SUCCESS;
} else if (signatureUnknown) {
signatureStatus = OpenPgpSignatureResult.SIGNATURE_UNKNOWN;
}
sigResult = new OpenPgpSignatureResult(signatureStatus, signatureUserId, signedOnly);
}
// return over handler on client side
@@ -514,7 +521,7 @@ public class OpenPgpService extends Service {
}
@Override
public void encryptAndSign(final byte[] inputBytes, final String[] encryptionUserIds,
public void signAndEncrypt(final byte[] inputBytes, final String[] encryptionUserIds,
final boolean asciiArmor, final IOpenPgpCallback callback) throws RemoteException {
final AppSettings settings = getAppSettings();