diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-09 19:55:35 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-09 19:55:35 +0200 |
| commit | 4ca7a1275117016afc26fec8e06d50815777f006 (patch) | |
| tree | 50d31863354cb4e8b007d8c254aa4df4d6bf5d40 /OpenPGP-Keychain/src | |
| parent | bf1334d6c0a778575e3b52bf281a2d2ae3a5dc23 (diff) | |
| download | open-keychain-4ca7a1275117016afc26fec8e06d50815777f006.tar.gz open-keychain-4ca7a1275117016afc26fec8e06d50815777f006.tar.bz2 open-keychain-4ca7a1275117016afc26fec8e06d50815777f006.zip | |
Ascii armror doc
Diffstat (limited to 'OpenPGP-Keychain/src')
4 files changed, 10 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java index 872dc1bda..13233f70b 100644 --- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java +++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java @@ -20,7 +20,7 @@ import android.os.Parcel; import android.os.Parcelable; public class CryptoError implements Parcelable { - public static final int ID_NO_WRONG_PASSPHRASE = 1; + public static final int ID_NO_OR_WRONG_PASSPHRASE = 1; public static final int ID_NO_USER_IDS = 2; int errorId; diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl index 1f910d4c6..31285671f 100644 --- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl +++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl @@ -27,6 +27,5 @@ interface ICryptoCallback { */ oneway void onSuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult); - oneway void onError(in CryptoError error); }
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl index 45a80dfd3..854ca0b05 100644 --- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl +++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl @@ -31,6 +31,8 @@ interface ICryptoService { * Byte array you want to encrypt * @param encryptionUserIds * User Ids (emails) of recipients + * @param asciiArmor + * Encode for ASCII (Radix-64, 33 percent overhead compared to binary) * @param callback * Callback where to return results */ @@ -41,6 +43,8 @@ interface ICryptoService { * * @param inputBytes * Byte array you want to encrypt + * @param asciiArmor + * Encode for ASCII (Radix-64, 33 percent overhead compared to binary) * @param callback * Callback where to return results */ @@ -55,6 +59,8 @@ interface ICryptoService { * User Ids (emails) of recipients * @param signatureUserId * User Ids (email) of sender + * @param asciiArmor + * Encode for ASCII (Radix-64, 33 percent overhead compared to binary) * @param callback * Callback where to return results */ diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java index 6d83857e7..8092cb86a 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java @@ -274,7 +274,7 @@ public class CryptoService extends Service { if (sign) { String passphrase = getCachedPassphrase(appSettings.getKeyId()); if (passphrase == null) { - callback.onError(new CryptoError(CryptoError.ID_NO_WRONG_PASSPHRASE, + callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE, "No or wrong passphrase!")); return; } @@ -322,7 +322,7 @@ public class CryptoService extends Service { String passphrase = getCachedPassphrase(appSettings.getKeyId()); if (passphrase == null) { - callback.onError(new CryptoError(CryptoError.ID_NO_WRONG_PASSPHRASE, + callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE, "No or wrong passphrase!")); return; } @@ -404,7 +404,7 @@ public class CryptoService extends Service { String passphrase = getCachedPassphrase(secretKeyId); if (passphrase == null) { - callback.onError(new CryptoError(CryptoError.ID_NO_WRONG_PASSPHRASE, + callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE, "No or wrong passphrase!")); return; } |