Ascii armror doc

5 files changed, 16 insertions, 5 deletions

diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
index 45a80dfd3..854ca0b05 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain-API-Demo/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/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;
             }