Improve encrypted session icon

Move the database migrations

app/widgets/Chat/_chat.tpl

@@ -87,11 +87,14 @@
                             placeholder="{$c->__('chat.placeholder')}"
                         {/if}
                     ></textarea>
-                    <span class="encrypted">
+                    <span class="control icon encrypted" title="{$c->__('omemo.encrypted')}">
                         <i class="material-icons">lock</i>
                     </span>
-                    <span class="encrypted_loading">
-                        <i class="material-icons">lock_clock</i>
+                    <span class="control icon encrypted_disabled" title="{$c->__('omemo.encrypted_disabled')}">
+                        <i class="material-icons">no_encryption</i>
+                    </span>
+                    <span class="control icon encrypted_loading" title="{$c->__('omemo.encrypted_loading')}">
+                        <i class="material-icons">lock_open</i>
                     </span>
                 </div>
             </form>

app/widgets/Chat/chat.css

@@ -118,18 +118,23 @@ main:not(.enabled) #chat_widget {
 }
 
 #chat_widget .chat_box form textarea ~ span.encrypted,
+#chat_widget .chat_box form textarea ~ span.encrypted_disabled,
 #chat_widget .chat_box form textarea ~ span.encrypted_loading {
     display: none;
 }
 
-#chat_widget .chat_box form textarea[data-encryptedstate="yes"] ~ span.encrypted,
-#chat_widget .chat_box form textarea[data-encryptedstate="build"] ~ span.encrypted_loading {
+#chat_widget .chat_box form textarea[data-encryptedstate="yes"],
+#chat_widget .chat_box form textarea[data-encryptedstate="build"] {
+    width: calc(100% - 4.5rem);
+}
+
+#chat_widget .chat_box form textarea[data-encryptedstate="yes"] ~ span.control.icon.encrypted,
+#chat_widget .chat_box form textarea[data-encryptedstate="build"] ~ span.control.icon.encrypted_loading {
     display: inline-block;
-    font-size: 2.5rem;
+    font-size: 2.75rem;
     position: absolute;
-    right: 1rem;
-    top: -0.5rem;
-    opacity: 0.25;
+    right: 0;
+    bottom: -0.35rem;
 }
 
 #chat_widget .chat_box span.primary,

app/widgets/Chat/chat.js

@@ -977,7 +977,6 @@ var Chat = {
             if (data.displayed) {
                 span.appendChild(Chat.getDisplayedIcoHtml(data.displayed));
             } else if (data.delivered) {
-                console.log(data);
                 span.appendChild(Chat.getDeliveredIcoHtml(data.delivered));
             }
         }

app/widgets/ChatOmemo/locales.ini

@@ -2,4 +2,7 @@
 fingerprints          = OMEMO Fingerprints
 generating_bundle     = "Generating the encryption keys, please wait…"
 generated_bundle      = Encryption keys generated
-building_sessions     = Building encryption sessions
+building_sessions     = Building encryption sessions
+encrypted             = Encrypted message
+encrypted_disabled    = Encryption disabled
+encrypted_loading     = Send a message to build the encrypted session

lib/moxl/src/Xec/Action/OMEMO/GetBundle.php

@@ -33,7 +33,10 @@ class GetBundle extends Action
 
         // Only refresh if the bundle is different
         if (!$localBd || !$localBd->sameAs($bd)) {
-            if ($localBd) $localBd->delete();
+            if ($localBd) {
+                $bd->has_session = $localBd->has_session;
+                $localBd->delete();
+            }
 
             $bd->save();