Merge branch 'staging'

CTemplar · Sep 10, 2019 · 6e37b48 · 6e37b48
2 parents a10be42 + f1cc482
commit 6e37b48
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/dist/5.3394858e876058923349.js b/dist/5.3394858e876058923349.js
diff --git a/dist/5.5126800a3472b47ca190.js b/dist/5.5126800a3472b47ca190.js
diff --git a/dist/README.md b/dist/README.md
@@ -2,9 +2,9 @@
 
 Official Angular cross-platform client for the CTemplar secure email service available at [https://ctemplar.com](https://ctemplar.com).
 
-RELEASE VERSION : **v1.2.5**    
+RELEASE VERSION : **v1.2.6**    
 
-SHA-256 checksum of `index.html` : **cf21ad3dd5e7fc1bbe86415cf92b084ff8749e1a1660ce435913dee05ff7e15e**  
+SHA-256 checksum of `index.html` : **230cfda5a17ae348ddf8a96661ac4bbee10e1b83d1d53042df913461ae6970df**  
 
 Find full release code and distribution at : [https://github.com/CTemplar/webclient/releases/latest](https://github.com/CTemplar/webclient/releases/latest)
 

diff --git a/dist/index.html b/dist/index.html
@@ -83,6 +83,6 @@ <h1 class="page-title text-secondary">
         </div>
     </noscript>
     <app-root></app-root>
-<script src="runtime.a9aa03f82aedf07a7fef.js" crossorigin="anonymous" defer integrity="sha384-jAjpSDcbYkHX9/LuhEZIPoEwOtz6iHr2hfsYJiMm46t6bYjws3rNBDaNh9/JrHk8"></script><script src="polyfills-es5.ba432e554cc84d676f34.js" crossorigin="anonymous" nomodule defer integrity="sha384-afZkScMEt+TDwa6pzGRGb2z/5aKAUwioAsyA1yX4UaeOKf3m+oekQfbeoBqvN0wr"></script><script src="polyfills.75e8ee5609230df1c9b0.js" crossorigin="anonymous" defer integrity="sha384-lJsz19FyesOevMa95EotxWy+llse0bt+JsV8ozd12urVLKSu4UbqnDPcT6ALXKZO"></script><script src="scripts.b84cfd1ad0c5f8206da7.js" crossorigin="anonymous" defer integrity="sha384-QS5Ow3bf3yXbXPdfAg+5qbwuZWZokaTCAbGxAIktQ9hcozFYbop0Yh/PH6zTAzHh"></script><script src="main.a98fda569a52cedd158d.js" crossorigin="anonymous" defer integrity="sha384-/LnMzRidWUYUkzpIdDBS7wE2BVm0g3xTs8sPPHoP2DjIBfWV3pOfdFXHhqch42a3"></script></body>
+<script src="runtime.44a3a09968de0ff0e02e.js" crossorigin="anonymous" defer integrity="sha384-HckBDrCv84XZWYXy457Ii3OZnC0iiQ/J8pv5WUPZxK3r5bDYPrgbJxJTrrhe4myA"></script><script src="polyfills-es5.ba432e554cc84d676f34.js" crossorigin="anonymous" nomodule defer integrity="sha384-afZkScMEt+TDwa6pzGRGb2z/5aKAUwioAsyA1yX4UaeOKf3m+oekQfbeoBqvN0wr"></script><script src="polyfills.75e8ee5609230df1c9b0.js" crossorigin="anonymous" defer integrity="sha384-lJsz19FyesOevMa95EotxWy+llse0bt+JsV8ozd12urVLKSu4UbqnDPcT6ALXKZO"></script><script src="scripts.b84cfd1ad0c5f8206da7.js" crossorigin="anonymous" defer integrity="sha384-QS5Ow3bf3yXbXPdfAg+5qbwuZWZokaTCAbGxAIktQ9hcozFYbop0Yh/PH6zTAzHh"></script><script src="main.46b73cb0bc175c0c7f24.js" crossorigin="anonymous" defer integrity="sha384-AOMFnFlnpHuuvRf/lTEaGy+R9vZDyda8Y3vgB5L4+UKQp6UNXFAd5YfQfAumqY5t"></script></body>
 
 </html>
diff --git a/dist/main.46b73cb0bc175c0c7f24.js b/dist/main.46b73cb0bc175c0c7f24.js
diff --git a/dist/main.a98fda569a52cedd158d.js b/dist/main.a98fda569a52cedd158d.js
diff --git a/dist/runtime.a9aa03f82aedf07a7fef.js → dist/runtime.44a3a09968de0ff0e02e.js b/dist/runtime.a9aa03f82aedf07a7fef.js → dist/runtime.44a3a09968de0ff0e02e.js
diff --git a/src/app/mail/mail-settings/security/security.component.html b/src/app/mail/mail-settings/security/security.component.html
@@ -138,10 +138,10 @@ <h3 class="modal-title w-100 text-dark" id="decryptContactsModal">
   <div class="modal-body bg-faded">
     <div *ngIf="isDecryptingContacts; else decryptingContacts" class="px-4">
       <label>Please be patient while your contacts are being decrypted, don't close your browser.</label>
-      <div align="center" *ngIf="!contactsState?.loaded">
+      <div align="center" *ngIf="!contactsState?.loaded && contactsState?.totalContacts===0">
         <app-loading-spinner [showSpinner]="true"></app-loading-spinner>
       </div>
-      <div class="my-4" *ngIf="contactsState?.loaded">
+      <div class="my-4" *ngIf="contactsState?.loaded || contactsState?.totalContacts!==0">
         <div class="info-list-val-text text-center">
           {{contactsState.noOfDecryptedContacts}} of {{contactsState.totalContacts}} contacts decrypted
         </div>

diff --git a/src/app/store/services/openpgp.service.ts b/src/app/store/services/openpgp.service.ts
@@ -59,7 +59,7 @@ export class OpenPgpService {
               this.pubkeys[mailbox.id] = mailbox.public_key;
               this.pubkeysArray.push(mailbox.public_key);
             }
-            if (mailbox.is_default) {
+            if (mailbox.is_default && !this.primaryMailbox) {
               this.primaryMailbox = mailbox;
             }
           });
@@ -247,6 +247,7 @@ export class OpenPgpService {
     this.pubkeys = null;
     this.privkeys = null;
     this.userKeys = null;
+    this.primaryMailbox = null;
     this.store.dispatch(new SetDecryptedKey({ decryptedKey: null }));
     this.pgpWorker.postMessage({ clear: true });