Merge pull request #1599 from CTemplar/dev

Release
CTemplar · Jan 17, 2022 · 9557339 · 9557339
2 parents 2575364 + bbc10a1
commit 9557339
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctemplar",
-  "version": "2.5.61",
+  "version": "2.5.62",
   "license": "Apache",
   "main": "electron-main.js",
   "description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",

diff --git a/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts b/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts
@@ -2056,7 +2056,7 @@ export class ComposeMailComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // check if all are internal + non-encrypted external
     const isInternal_NonEncExternal = contacts.every(
-      c => (c.keyInfo.isExistKey && c.keyInfo.isCTemplarKey) || !c.contact.enabled_encryption,
+      c => (c?.keyInfo?.isExistKey && c?.keyInfo?.isCTemplarKey) || !c?.contact?.enabled_encryption,
     );
     if (isInternal_NonEncExternal) return false;
 
@@ -2070,8 +2070,8 @@ export class ComposeMailComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // check if all external are encrypted and different type
     const isAllExternalEncDifferentType =
-      externalContacts.some(c => c.encryption_type === PGPEncryptionType.PGP_INLINE) &&
-      externalContacts.some(c => c.encryption_type === PGPEncryptionType.PGP_MIME); //TODO verify logic for PGP_MIME
+      externalContacts.some(c => c?.encryption_type === PGPEncryptionType.PGP_INLINE) &&
+      externalContacts.some(c => c?.encryption_type === PGPEncryptionType.PGP_MIME); //TODO verify logic for PGP_MIME
     if (isAllExternalEncDifferentType) return true;
 
     return false;