Merge pull request #1631 from CTemplar/dev

Release
CTemplar · Feb 1, 2022 · 5ef33e0 · 5ef33e0
2 parents 20b029b + c60588a
commit 5ef33e0
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctemplar",
-  "version": "2.5.64",
+  "version": "2.5.65",
   "license": "Apache",
   "main": "electron-main.js",
   "description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",
@@ -49,7 +49,7 @@
     "@ngrx/store-devtools": "^10.1.2",
     "@ngx-translate/core": "^12.1.2",
     "@ngx-translate/http-loader": "^4.0.0",
-    "@sentry/browser": "^6.7.2",
+    "@sentry/browser": "^6.17.2",
     "angular2-cookie-law": "^7.0.1",
     "bcryptjs": "^2.4.3",
     "electron-context-menu": "^3.1.0",

diff --git a/src/app/mail/mail-contact/mail-contact.component.html b/src/app/mail/mail-contact/mail-contact.component.html
@@ -194,12 +194,12 @@
         <table class="table mail-contact">
           <thead class="mail-contact-header border-bottom-0 hidden-xs-down">
             <tr>
-              <th></th>
-              <th></th>
-              <th>
+              <th id="contact-check"></th>
+              <th id="contact-star"></th>
+              <th id="contact-name">
                 <strong>{{ 'common.name' | translate }}</strong>
               </th>
-              <th>
+              <th id="contact-email">
                 <strong>{{ 'common.email' | translate }}</strong>
               </th>
             </tr>
@@ -211,7 +211,7 @@
                 *ngFor="let contact of contactsState.contacts"
                 [class.active-contact]="selectedContact == contact"
               >
-                <td (click)="checkContact(contact)">
+                <td (click)="checkContact(contact)" headers="contact-check">
                   <div class="mail-list-col-item mail-checkbox">
                     <mat-checkbox
                       [(ngModel)]="contact.markForDelete"
@@ -224,7 +224,7 @@
                     <label [attr.for]="contact.id" class="fancy-field-empty"></label>
                   </div>
                 </td>
-                <td>
+                <td headers="contact-star">
                   <a
                     [ngbTooltip]="
                       contact.starred ? ('mail_list.remove_star' | translate) : ('mail_list.start_message' | translate)
@@ -239,7 +239,7 @@
                     <i class="icon icon-star-filled" [ngClass]="{ 'icon-star': !contact.starred }"></i>
                   </a>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-name">
                   <div class="mail-list-col-item mail-from-name cursor-pointer">
                     <span
                       *ngIf="contact.is_encrypted && !contact.name; else contactName"
@@ -252,7 +252,7 @@
                     </ng-template>
                   </div>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-email">
                   <div class="mail-contact-col-lg cursor-pointer">
                     <div class="mail-desc">
                       <p>
@@ -283,7 +283,7 @@
                 *ngFor="let contact of contactsState.contacts"
                 [class.active-contact]="selectedContact == contact"
               >
-                <td (click)="checkContact(contact)">
+                <td (click)="checkContact(contact)" headers="contact-check">
                   <div class="mail-list-col-item mail-checkbox">
                     <mat-checkbox
                       [(ngModel)]="contact.markForDelete"
@@ -296,7 +296,7 @@
                     <label [attr.for]="contact.id" class="fancy-field-empty"></label>
                   </div>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-name">
                   <div class="mail-list-col-item cursor-pointer">
                     <span
                       *ngIf="contact.is_encrypted && !contact.name; else contactName"
@@ -328,7 +328,7 @@
                     </div>
                   </div>
                 </td>
-                <td>
+                <td headers="contact-star">
                   <a
                     (click)="contact.isDecryptedFrontend && toggleStarred(contact)"
                     [ngClass]="{ 'is-fav': contact.starred }"

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
@@ -2008,10 +2008,8 @@ export class ComposeMailComponent implements OnInit, AfterViewInit, OnDestroy {
         this.isMixedContacts$.next(isMixedContacts);
         this.pgpEncryptionType = isMixedContacts ? null : pgpEncryptionType;
 
-        // if encryption is set to PGP_INLINE or PGP_MIME and we have at least one external with PGP enabled
-        this.draftMail.is_encrypted = this.pgpEncryptionType
-          ? !this.receiversInfo.some(c => c?.isExternal)
-          : !!this.pgpEncryptionType;
+        // if encryption is set to PGP_INLINE or PGP_MIME or we have at least one external contact
+        this.draftMail.is_encrypted = !(this.pgpEncryptionType || this.receiversInfo.some(c => c?.isExternal));
         this.draftMail.encryption_type = this.pgpEncryptionType;
 
         if (this.pgpEncryptionType === PGPEncryptionType.PGP_INLINE && this.draftMail?.is_html) {

diff --git a/src/assets/static/email.html b/src/assets/static/email.html
@@ -293,7 +293,7 @@
                         line-height: 24px;
                       "
                     >
-                      You have received a secure massage from
+                      You have received a secure message from
                     </td>
                   </tr>
                   <tr>