Merge pull request #357 from nanu-c/v0.9.7

V0.9.7

app/config/config.go

@@ -16,7 +16,7 @@ import (
 
 var AppName = "textsecure.nanuc"
 
-var AppVersion = "0.9.6"
+var AppVersion = "0.9.7"
 
 // Do not allow sending attachments larger than 100M for now
 var MaxAttachmentSize int64 = 100 * 1024 * 1024

appimage/AppDir/axolotl.appdata.xml

@@ -21,6 +21,8 @@
         </p>
     </description>
     <releases>
+      <release version="0.9.7" date="2021-02-08">
+          <url>https://github.com/nanu-c/axolotl/releases/tag/v0.9.7</url>
       <release version="0.9.6" date="2021-01-31">
           <url>https://github.com/nanu-c/axolotl/releases/tag/v0.9.6</url>
       </release>

axolotl-web/src/components/StartChatModal.vue

@@ -9,7 +9,7 @@
           </button>
         </div>
         <div class="modal-body">
-          <p v-translate>Please ask your conversation partner to start the chat first.</p>
+          <p v-translate>New conversations are temporarily disabled. You can create a new chat from the linked Desktop Client. Alternatively, your counterparty could start the discussion.</p>
           <div class="modal-footer">
             <button type="button" class="btn btn-primary" @click="$emit('close')" v-translate>Close</button>
           </div>

axolotl-web/src/components/WarningMessage.vue

@@ -1,9 +1,15 @@
 <template>
-  <div class="warning-box" v-if="mainWarningMessage">
-      <span class="close-warning-box" @click="mainWarningMessage = false;">x</span>
-      Due to upstream changes in Signal, some features are currently broken.
+  <div class="warning-box mb-2" v-if="mainWarningMessage">
+    <span class="close-warning-box" @click="mainWarningMessage = false;">x</span>
+    <p v-translate class="pb-0 mb-0"> Due to upstream changes in Signal, some features are currently broken.
       We're working as fast as we can to bring them back.
-      Follow the progress or join us to help with development <a href="https://t.me/axolotl_dev" target="_blank" @click="openExtern($event, 'https://t.me/axolotl_dev')">telegram</a>.
+    </p>
+    <div class="d-flex">
+      <span v-translate class="mr-1">
+        Follow the progress or join us to help with development on
+      </span>
+      <a href="https://t.me/axolotl_dev" target="_blank" @click="openExtern($event, 'https://t.me/axolotl_dev')">telegram</a>.
+    </div>
   </div>
 </template>
 

docs/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.9.7 (Feb 8 2021)
+------------------------------------
+* Add support for registration captchas (nanu-c)
+* Deduplicate chat's that exists twice (nanu-c)
+* German translation update (danfro)
+* Add complete translation for PT-BR (yds12)
+* Don't show the currently broken warning everywhere (flaburgan)
+* Fix messages sent by signal desktop appearing in the wrong chat (nanu-c)
+
+
 0.9.6 (Jan 31 2021)
 ------------------------------------
 * Add a message to warn about current broken state in Axolotl due to upstream Signal changes (flaburgan)

docs/INSTALL.md

@@ -71,7 +71,7 @@ To build the application, use the following command from the root of this reposi
 
 To install the built snap, use snap:
 
-`sudo snap install axolotl_0.9.6_amd64.snap --dangerous`
+`sudo snap install axolotl_0.9.7_amd64.snap --dangerous`
 
 **Run**
 

flatpak/org.nanuc.Axolotl.appdata.xml

@@ -21,6 +21,9 @@
         </p>
     </description>
     <releases>
+      <release version="0.9.7" date="2021-02-08">
+          <url>https://github.com/nanu-c/axolotl/releases/tag/v0.9.7</url>
+      </release>
       <release version="0.9.6" date="2021-01-31">
           <url>https://github.com/nanu-c/axolotl/releases/tag/v0.9.6</url>
       </release>

guis/qml/qml/MainQML.qml

@@ -26,6 +26,13 @@ import QtMultimedia 5.8
       var msg = "[Axolotl Web View] [JS] (%1:%2) %3".arg(sourceID).arg(lineNumber).arg(message)
       console.log(msg)
     }
+    onLoadingChanged:{
+      // interceptor to make the registration captcha work
+      var msg = "[Axolotl Web View] [JS] url changed %1".arg(url)
+      console.log(msg)
+      var  interceptor = "window.onToken = function(token){window.location = 'http://localhost:9080/?token='+token;};"
+      webView.runJavaScript(interceptor)
+    }
   WebEngineProfile{
     id:webProfile
   }

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "textsecure.nanuc",
-    "version": "0.9.6",
+    "version": "0.9.7",
     "description": "A Signal compatible messaging client for Ubuntu phones",
     "title": "Axolotl",
     "architecture": "@CLICK_ARCH@",

po/ar.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/pages/About.vue:4 src/pages/Register.vue:5
+#: src/pages/About.vue:4 src/pages/Register.vue:6
 msgid "A cross-plattform signal client"
 msgstr ""
 
@@ -103,6 +103,12 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#: src/components/WarningMessage.vue:3
+msgid ""
+"Due to upstream changes in Signal, some features are currently broken.\n"
+"      We're working as fast as we can to bring them back."
+msgstr ""
+
 #: src/components/EditContactModal.vue:5
 msgid "Edit"
 msgstr ""
@@ -129,6 +135,10 @@ msgstr ""
 msgid "Error communicating with Signal servers"
 msgstr ""
 
+#: src/components/WarningMessage.vue:7
+msgid "Follow the progress or join us to help with development on"
+msgstr ""
+
 #: src/pages/EditGroup.vue:4 src/pages/NewGroup.vue:4
 msgid "Group name"
 msgstr "أسم المجموعة"
@@ -193,6 +203,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#: src/components/StartChatModal.vue:11
+msgid ""
+"New conversations are temporarily disabled. You can create a new chat from "
+"the linked Desktop Client. Alternatively, your counterparty could start the "
+"discussion."
+msgstr ""
+
 #: src/components/Header.vue:99 src/components/Header.vue:149
 msgid "New group"
 msgstr "مجموعة جديدة"
@@ -202,11 +219,11 @@ msgstr "مجموعة جديدة"
 msgid "New password"
 msgstr "رسالة جديدة"
 
-#: src/pages/Register.vue:16
+#: src/pages/Register.vue:17
 msgid "Next"
 msgstr ""
 
-#: src/pages/ChatList.vue:45
+#: src/pages/ChatList.vue:46
 msgid "No chats available"
 msgstr ""
 
@@ -251,10 +268,6 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#: src/components/StartChatModal.vue:11
-msgid "Please ask your conversation partner to start the chat first."
-msgstr ""
-
 #: src/pages/Settings.vue:5
 #, fuzzy
 msgid "Registered number"
@@ -264,7 +277,7 @@ msgstr "سجل"
 msgid "Repeat password"
 msgstr ""
 
-#: src/pages/Register.vue:25
+#: src/pages/Register.vue:26
 msgid "Request code"
 msgstr ""
 
@@ -334,7 +347,7 @@ msgid ""
 "This is a free and open source signal client written in golang and vuejs."
 msgstr ""
 
-#: src/components/Header.vue:27 src/pages/ChatList.vue:25
+#: src/components/Header.vue:27 src/pages/ChatList.vue:26
 #, fuzzy
 msgid "Unknown group"
 msgstr "مجموعة جديدة"

po/be.po

@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/pages/About.vue:4 src/pages/Register.vue:5
+#: src/pages/About.vue:4 src/pages/Register.vue:6
 msgid "A cross-plattform signal client"
 msgstr ""
 
@@ -103,6 +103,12 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#: src/components/WarningMessage.vue:3
+msgid ""
+"Due to upstream changes in Signal, some features are currently broken.\n"
+"      We're working as fast as we can to bring them back."
+msgstr ""
+
 #: src/components/EditContactModal.vue:5
 msgid "Edit"
 msgstr ""
@@ -129,6 +135,10 @@ msgstr ""
 msgid "Error communicating with Signal servers"
 msgstr ""
 
+#: src/components/WarningMessage.vue:7
+msgid "Follow the progress or join us to help with development on"
+msgstr ""
+
 #: src/pages/EditGroup.vue:4 src/pages/NewGroup.vue:4
 msgid "Group name"
 msgstr "Імя групы"
@@ -191,6 +201,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#: src/components/StartChatModal.vue:11
+msgid ""
+"New conversations are temporarily disabled. You can create a new chat from "
+"the linked Desktop Client. Alternatively, your counterparty could start the "
+"discussion."
+msgstr ""
+
 #: src/components/Header.vue:99 src/components/Header.vue:149
 msgid "New group"
 msgstr "Новая група"
@@ -200,11 +217,11 @@ msgstr "Новая група"
 msgid "New password"
 msgstr "Новае паведамленне"
 
-#: src/pages/Register.vue:16
+#: src/pages/Register.vue:17
 msgid "Next"
 msgstr ""
 
-#: src/pages/ChatList.vue:45
+#: src/pages/ChatList.vue:46
 msgid "No chats available"
 msgstr ""
 
@@ -248,10 +265,6 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#: src/components/StartChatModal.vue:11
-msgid "Please ask your conversation partner to start the chat first."
-msgstr ""
-
 #: src/pages/Settings.vue:5
 #, fuzzy
 msgid "Registered number"
@@ -261,7 +274,7 @@ msgstr "Зарэгістравацца"
 msgid "Repeat password"
 msgstr ""
 
-#: src/pages/Register.vue:25
+#: src/pages/Register.vue:26
 msgid "Request code"
 msgstr ""
 
@@ -329,7 +342,7 @@ msgid ""
 "This is a free and open source signal client written in golang and vuejs."
 msgstr ""
 
-#: src/components/Header.vue:27 src/pages/ChatList.vue:25
+#: src/components/Header.vue:27 src/pages/ChatList.vue:26
 #, fuzzy
 msgid "Unknown group"
 msgstr "Новая група"

po/bg.po

@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/About.vue:4 src/pages/Register.vue:5
+#: src/pages/About.vue:4 src/pages/Register.vue:6
 msgid "A cross-plattform signal client"
 msgstr ""
 
@@ -104,6 +104,12 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#: src/components/WarningMessage.vue:3
+msgid ""
+"Due to upstream changes in Signal, some features are currently broken.\n"
+"      We're working as fast as we can to bring them back."
+msgstr ""
+
 #: src/components/EditContactModal.vue:5
 msgid "Edit"
 msgstr ""
@@ -130,6 +136,10 @@ msgstr ""
 msgid "Error communicating with Signal servers"
 msgstr ""
 
+#: src/components/WarningMessage.vue:7
+msgid "Follow the progress or join us to help with development on"
+msgstr ""
+
 #: src/pages/EditGroup.vue:4 src/pages/NewGroup.vue:4
 msgid "Group name"
 msgstr "Име на групата"
@@ -194,6 +204,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#: src/components/StartChatModal.vue:11
+msgid ""
+"New conversations are temporarily disabled. You can create a new chat from "
+"the linked Desktop Client. Alternatively, your counterparty could start the "
+"discussion."
+msgstr ""
+
 #: src/components/Header.vue:99 src/components/Header.vue:149
 msgid "New group"
 msgstr "Нова група"
@@ -203,11 +220,11 @@ msgstr "Нова група"
 msgid "New password"
 msgstr "Ново съобщение"
 
-#: src/pages/Register.vue:16
+#: src/pages/Register.vue:17
 msgid "Next"
 msgstr ""
 
-#: src/pages/ChatList.vue:45
+#: src/pages/ChatList.vue:46
 msgid "No chats available"
 msgstr ""
 
@@ -252,10 +269,6 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#: src/components/StartChatModal.vue:11
-msgid "Please ask your conversation partner to start the chat first."
-msgstr ""
-
 #: src/pages/Settings.vue:5
 #, fuzzy
 msgid "Registered number"
@@ -265,7 +278,7 @@ msgstr "Регистрирай"
 msgid "Repeat password"
 msgstr ""
 
-#: src/pages/Register.vue:25
+#: src/pages/Register.vue:26
 msgid "Request code"
 msgstr ""
 
@@ -335,7 +348,7 @@ msgid ""
 "This is a free and open source signal client written in golang and vuejs."
 msgstr ""
 
-#: src/components/Header.vue:27 src/pages/ChatList.vue:25
+#: src/components/Header.vue:27 src/pages/ChatList.vue:26
 #, fuzzy
 msgid "Unknown group"
 msgstr "Нова група"