Added S/MIME encrypt only

app/src/main/java/eu/faircode/email/EntityMessage.java

@@ -104,6 +104,7 @@ public class EntityMessage implements Serializable {
     static final Integer SMIME_SIGNENCRYPT = 3;
     static final Integer SMIME_SIGNONLY = 4;
     static final Integer PGP_ENCRYPTONLY = 5;
+    static final Integer SMIME_ENCRYPTONLY = 6;
 
     static final Integer PRIORITIY_LOW = 0;
     static final Integer PRIORITIY_NORMAL = 1;

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1638,6 +1638,7 @@ public class FragmentCompose extends FragmentBase {
 
                 if (!ActivityBilling.isPro(context) &&
                         (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) ||
+                                EntityMessage.SMIME_ENCRYPTONLY.equals(draft.ui_encrypt) ||
                                 EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)))
                     draft.ui_encrypt = null;
 
@@ -2134,10 +2135,12 @@ public class FragmentCompose extends FragmentBase {
             tv.setText(EntityMessage.PGP_SIGNONLY.equals(encrypt) ? "P" : "S");
         } else if (EntityMessage.PGP_ENCRYPTONLY.equals(encrypt) ||
                 EntityMessage.PGP_SIGNENCRYPT.equals(encrypt) ||
+                EntityMessage.SMIME_ENCRYPTONLY.equals(encrypt) ||
                 EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt)) {
             ibEncrypt.setImageResource(R.drawable.twotone_lock_24);
             ibEncrypt.setImageTintList(ColorStateList.valueOf(colorEncrypt));
-            tv.setText(EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt) ? "S" : "P");
+            tv.setText(EntityMessage.SMIME_ENCRYPTONLY.equals(encrypt) ||
+                    EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt) ? "S" : "P");
         } else {
             ibEncrypt.setImageResource(R.drawable.twotone_lock_open_24);
             ibEncrypt.setImageTintList(ColorStateList.valueOf(colorActionForeground));
@@ -2177,6 +2180,7 @@ public class FragmentCompose extends FragmentBase {
             bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_sign);
         else if (EntityMessage.PGP_ENCRYPTONLY.equals(encrypt) ||
                 EntityMessage.PGP_SIGNENCRYPT.equals(encrypt) ||
+                EntityMessage.SMIME_ENCRYPTONLY.equals(encrypt) ||
                 EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt))
             bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_encrypt);
         else
@@ -2313,7 +2317,8 @@ public class FragmentCompose extends FragmentBase {
         } else {
             if (EntityMessage.ENCRYPT_NONE.equals(encrypt) || encrypt == null)
                 encrypt = EntityMessage.SMIME_SIGNENCRYPT;
-            else if (EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt))
+            else if (EntityMessage.SMIME_ENCRYPTONLY.equals(encrypt) ||
+                    EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt))
                 encrypt = EntityMessage.SMIME_SIGNONLY;
             else
                 encrypt = EntityMessage.ENCRYPT_NONE;
@@ -3198,6 +3203,7 @@ public class FragmentCompose extends FragmentBase {
 
     private void onEncrypt(final EntityMessage draft, final int action, final Bundle extras, final boolean interactive) {
         if (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) ||
+                EntityMessage.SMIME_ENCRYPTONLY.equals(draft.ui_encrypt) ||
                 EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)) {
             Bundle args = new Bundle();
             args.putLong("id", draft.id);
@@ -4470,6 +4476,9 @@ public class FragmentCompose extends FragmentBase {
                         bpContent.writeTo(fos);
                     }
 
+                String signAlgorithm = null;
+                byte[] signedMessage = null;
+                if (!EntityMessage.SMIME_ENCRYPTONLY.equals(type)) {
                     if (EntityMessage.SMIME_SIGNONLY.equals(type)) {
                         EntityAttachment cattachment = new EntityAttachment();
                         cattachment.message = draft.id;
@@ -4491,7 +4500,7 @@ public class FragmentCompose extends FragmentBase {
                     CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator();
                     cmsGenerator.addCertificates(store);
 
-                String signAlgorithm = prefs.getString("sign_algo_smime", "SHA-256");
+                    signAlgorithm = prefs.getString("sign_algo_smime", "SHA-256");
 
                     String algorithm = privkey.getAlgorithm();
 
@@ -4513,7 +4522,7 @@ public class FragmentCompose extends FragmentBase {
 
                     CMSTypedData cmsData = new CMSProcessableFile(sinput);
                     CMSSignedData cmsSignedData = cmsGenerator.generate(cmsData);
-                byte[] signedMessage = cmsSignedData.getEncoded();
+                    signedMessage = cmsSignedData.getEncoded();
 
                     Helper.secureDelete(sinput);
 
@@ -4540,6 +4549,7 @@ public class FragmentCompose extends FragmentBase {
 
                         return null;
                     }
+                }
 
                 List<Address> addresses = new ArrayList<>();
                 if (draft.to != null)
@@ -4588,6 +4598,7 @@ public class FragmentCompose extends FragmentBase {
                 if (own && SmimeHelper.match(privkey, chain[0]))
                     certs.add(chain[0]);
 
+                if (!EntityMessage.SMIME_ENCRYPTONLY.equals(type)) {
                     // Build signature
                     BodyPart bpSignature = new MimeBodyPart();
                     bpSignature.setFileName("smime.p7s");
@@ -4606,6 +4617,7 @@ public class FragmentCompose extends FragmentBase {
                     multipart.addBodyPart(bpSignature);
                     imessage.setContent(multipart);
                     imessage.saveChanges();
+                }
 
                 // Encrypt
                 CMSEnvelopedDataGenerator cmsEnvelopedDataGenerator = new CMSEnvelopedDataGenerator();
@@ -5218,7 +5230,8 @@ public class FragmentCompose extends FragmentBase {
             if (!saved && isEmpty())
                 onAction(R.id.action_delete, "empty");
             else {
-                boolean finish = EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt) ||
+                boolean finish = EntityMessage.SMIME_ENCRYPTONLY.equals(encrypt) ||
+                        EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt) ||
                         EntityMessage.PGP_ENCRYPTONLY.equals(encrypt) ||
                         EntityMessage.PGP_SIGNENCRYPT.equals(encrypt);
 
@@ -7236,7 +7249,8 @@ public class FragmentCompose extends FragmentBase {
                         if (!eparts.contains(EntityAttachment.SMIME_SIGNATURE) ||
                                 !eparts.contains(EntityAttachment.SMIME_CONTENT))
                             dirty = true;
-                    } else if (EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)) {
+                    } else if (EntityMessage.SMIME_ENCRYPTONLY.equals(draft.ui_encrypt) ||
+                            EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)) {
                         if (!eparts.contains(EntityAttachment.SMIME_MESSAGE))
                             dirty = true;
                     }
@@ -7451,6 +7465,7 @@ public class FragmentCompose extends FragmentBase {
                     boolean shouldEncrypt = EntityMessage.PGP_ENCRYPTONLY.equals(draft.ui_encrypt) ||
                             EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt) ||
                             (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) && action == R.id.action_send) ||
+                            EntityMessage.SMIME_ENCRYPTONLY.equals(draft.ui_encrypt) ||
                             EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt) ||
                             (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) && action == R.id.action_send);
                     boolean needsEncryption = (dirty && !encrypted && shouldEncrypt);
@@ -7475,6 +7490,7 @@ public class FragmentCompose extends FragmentBase {
                         boolean unencrypted =
                                 (!EntityMessage.PGP_ENCRYPTONLY.equals(draft.ui_encrypt) &&
                                         !EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt) &&
+                                        !EntityMessage.SMIME_ENCRYPTONLY.equals(draft.ui_encrypt) &&
                                         !EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt));
                         if ((dirty && unencrypted) || encrypted) {
                             if (save_drafts) {

app/src/main/java/eu/faircode/email/FragmentDialogSend.java

@@ -401,6 +401,7 @@ public class FragmentDialogSend extends FragmentDialogBase {
                                     message.identity != null) {
                                 int iencrypt =
                                         (encrypt == EntityMessage.SMIME_SIGNONLY ||
+                                                encrypt == EntityMessage.SMIME_ENCRYPTONLY ||
                                                 encrypt == EntityMessage.SMIME_SIGNENCRYPT
                                                 ? 1 : 0);
                                 db.identity().setIdentityEncrypt(message.identity, iencrypt);

app/src/main/res/values/strings.xml

@@ -2841,6 +2841,7 @@
         <item>PGP encrypt-only</item>
         <item>PGP sign+encrypt</item>
         <item>S/MIME sign-only</item>
+        <item>S/MIME encrypt-only</item>
         <item>S/MIME sign+encrypt</item>
     </string-array>
 
@@ -2850,6 +2851,7 @@
         <item>5</item>
         <item>1</item>
         <item>4</item>
+        <item>6</item>
         <item>3</item>
     </integer-array>