Update signal protocol library. Fixes #85

aebruno · Nov 14, 2017 · 4d5f4c8 · 4d5f4c8
1 parent 700ff53
commit 4d5f4c8
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 44 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -2,6 +2,14 @@
 ChangeLog
 ===============================================================================
 
+`v0.4.4`_ (2017-11-14)
+---------------------------
+
+* Built using SailfishOSSDK-Beta-1611-Qt5-linux-64
+* Tested on Sailfish OS 2.1.2.3 (Kiiminkijoki)
+* Fix #85 signal protocol updates
+* Add Polish translation by paytchoo PR #84
+
 `v0.4.3`_ (2017-04-11)
 ---------------------------
 
@@ -87,3 +95,4 @@ ChangeLog
 .. _v0.4.1: https://github.com/aebruno/whisperfish/releases/tag/v0.4.1
 .. _v0.4.2: https://github.com/aebruno/whisperfish/releases/tag/v0.4.2
 .. _v0.4.3: https://github.com/aebruno/whisperfish/releases/tag/v0.4.3
+.. _v0.4.4: https://github.com/aebruno/whisperfish/releases/tag/v0.4.4
diff --git a/README.rst b/README.rst
@@ -33,7 +33,7 @@ Features
 - [x] Encrypted message store
 - [x] Advanced user settings
 - [ ] Multi-Device support (links with Signal Desktop)
-- [ ] Encrypted attachments
+- [ ] Encrypted local attachment store
 - [ ] Archiving conversations
 
 -------------------------------------------------------------------------------

diff --git a/build.sh b/build.sh
@@ -16,7 +16,7 @@
 #
 
 APPNAME=harbour-whisperfish
-VERSION=$(git describe --long --tags --dirty --always 2>/dev/null | cut -f2 -d'v')
+VERSION=$(git describe --long --tags --always 2>/dev/null | cut -f2 -d'v')
 GOQT_VERSION=c6ada02b904734c7f78a8032acd2e6fee3e58dba
 QT_VERSION=5.7.0
 

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -6,8 +6,6 @@ ignore:
 import:
 - package: github.com/Sirupsen/logrus
 - package: github.com/aebruno/textsecure
-  version: websocket-updates
-- package: github.com/janimo/textsecure
   subpackages:
   - axolotl
   - curve25519sign

diff --git a/qml/i18n/whisperfish_de.ts b/qml/i18n/whisperfish_de.ts
@@ -34,19 +34,19 @@
         <translation>Neue Nachricht</translation>
     </message>
     <message id="whisperfish-session-section-today">
-        <location filename="../harbour-whisperfish.qml" line="128"/>
+        <location filename="../harbour-whisperfish.qml" line="131"/>
         <source>Today</source>
         <extracomment>Session section label for today</extracomment>
         <translation>Heute</translation>
     </message>
     <message id="whisperfish-session-section-yesterday">
-        <location filename="../harbour-whisperfish.qml" line="132"/>
+        <location filename="../harbour-whisperfish.qml" line="135"/>
         <source>Yesterday</source>
         <extracomment>Session section label for yesterday</extracomment>
         <translation>Gestern</translation>
     </message>
     <message id="whisperfish-session-section-older">
-        <location filename="../harbour-whisperfish.qml" line="136"/>
+        <location filename="../harbour-whisperfish.qml" line="139"/>
         <source>Older</source>
         <extracomment>Session section label for older</extracomment>
         <translation>Älter</translation>
@@ -253,9 +253,10 @@
     </message>
     <message id="whisperfish-delete-message">
         <location filename="../pages/MessagesView.qml" line="97"/>
-        <source>Deleting</source>
-        <extracomment>Deleting message remorse</extracomment>
-        <translation>Löschen</translation>
+        <source>Deleteing</source>
+        <oldsource>Deleting</oldsource>
+        <extracomment>Deleteing message remorse</extracomment>
+        <translation type="unfinished">Löschen</translation>
     </message>
     <message id="whisperfish-resend-message">
         <location filename="../pages/MessagesView.qml" line="107"/>
@@ -314,7 +315,7 @@
     <message id="whisperfish-error-verify-contact">
         <location filename="../pages/NewMessage.qml" line="108"/>
         <source>Warning: could not verify contact in Signal</source>
-        <extracomment>Could not verify contact is registered with signal</extracomment>
+        <extracomment>Could verify contact is registered with signal</extracomment>
         <translation>Warnung: Kontakt konnte nicht verifiziert werden</translation>
     </message>
     <message id="whisperfish-recipient">
@@ -432,18 +433,21 @@
         <translation>Signal wird dich anrufen, um dir einen 6-stelligen Code mitzuteilen. Sei bereit zum Notieren.</translation>
     </message>
     <message id="whisperfish-reset-peer-accept">
+        <location filename="../pages/PeerIdentityChanged.qml" line="24"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="24"/>
         <source>Confirm</source>
         <extracomment>Reset peer identity accept text</extracomment>
         <translation>Bestätigen</translation>
     </message>
     <message id="whisperfish-peer-not-trusted">
+        <location filename="../pages/PeerIdentityChanged.qml" line="32"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="32"/>
         <source>Peer identity is not trusted</source>
         <extracomment>Peer identity not trusted</extracomment>
         <translation>Peer Identität wird nicht vertraut</translation>
     </message>
     <message id="whisperfish-peer-not-trusted-message">
+        <location filename="../pages/PeerIdentityChanged.qml" line="42"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="42"/>
         <source>WARNING: %1 identity is no longer trusted. Tap Confirm to reset peer identity.</source>
         <extracomment>Peer identity not trusted message</extracomment>

diff --git a/qml/i18n/whisperfish_en.ts b/qml/i18n/whisperfish_en.ts
@@ -34,19 +34,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-session-section-today">
-        <location filename="../harbour-whisperfish.qml" line="128"/>
+        <location filename="../harbour-whisperfish.qml" line="131"/>
         <source>Today</source>
         <extracomment>Session section label for today</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-session-section-yesterday">
-        <location filename="../harbour-whisperfish.qml" line="132"/>
+        <location filename="../harbour-whisperfish.qml" line="135"/>
         <source>Yesterday</source>
         <extracomment>Session section label for yesterday</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-session-section-older">
-        <location filename="../harbour-whisperfish.qml" line="136"/>
+        <location filename="../harbour-whisperfish.qml" line="139"/>
         <source>Older</source>
         <extracomment>Session section label for older</extracomment>
         <translation type="unfinished"></translation>
@@ -253,8 +253,9 @@
     </message>
     <message id="whisperfish-delete-message">
         <location filename="../pages/MessagesView.qml" line="97"/>
-        <source>Deleting</source>
-        <extracomment>Deleting message remorse</extracomment>
+        <source>Deleteing</source>
+        <oldsource>Deleting</oldsource>
+        <extracomment>Deleteing message remorse</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-resend-message">
@@ -314,7 +315,7 @@
     <message id="whisperfish-error-verify-contact">
         <location filename="../pages/NewMessage.qml" line="108"/>
         <source>Warning: could not verify contact in Signal</source>
-        <extracomment>Could not verify contact is registered with signal</extracomment>
+        <extracomment>Could verify contact is registered with signal</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-recipient">
@@ -432,18 +433,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-reset-peer-accept">
+        <location filename="../pages/PeerIdentityChanged.qml" line="24"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="24"/>
         <source>Confirm</source>
         <extracomment>Reset peer identity accept text</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-peer-not-trusted">
+        <location filename="../pages/PeerIdentityChanged.qml" line="32"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="32"/>
         <source>Peer identity is not trusted</source>
         <extracomment>Peer identity not trusted</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="whisperfish-peer-not-trusted-message">
+        <location filename="../pages/PeerIdentityChanged.qml" line="42"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="42"/>
         <source>WARNING: %1 identity is no longer trusted. Tap Confirm to reset peer identity.</source>
         <extracomment>Peer identity not trusted message</extracomment>

diff --git a/qml/i18n/whisperfish_nl.ts b/qml/i18n/whisperfish_nl.ts
@@ -34,19 +34,19 @@
         <translation>Nieuw bericht</translation>
     </message>
     <message id="whisperfish-session-section-today">
-        <location filename="../harbour-whisperfish.qml" line="128"/>
+        <location filename="../harbour-whisperfish.qml" line="131"/>
         <source>Today</source>
         <extracomment>Session section label for today</extracomment>
         <translation>Vandaag</translation>
     </message>
     <message id="whisperfish-session-section-yesterday">
-        <location filename="../harbour-whisperfish.qml" line="132"/>
+        <location filename="../harbour-whisperfish.qml" line="135"/>
         <source>Yesterday</source>
         <extracomment>Session section label for yesterday</extracomment>
         <translation>Gisteren</translation>
     </message>
     <message id="whisperfish-session-section-older">
-        <location filename="../harbour-whisperfish.qml" line="136"/>
+        <location filename="../harbour-whisperfish.qml" line="139"/>
         <source>Older</source>
         <extracomment>Session section label for older</extracomment>
         <translation>Ouder</translation>
@@ -253,9 +253,10 @@
     </message>
     <message id="whisperfish-delete-message">
         <location filename="../pages/MessagesView.qml" line="97"/>
-        <source>Deleting</source>
-        <extracomment>Deleting message remorse</extracomment>
-        <translation>Wordt verwijderd</translation>
+        <source>Deleteing</source>
+        <oldsource>Deleting</oldsource>
+        <extracomment>Deleteing message remorse</extracomment>
+        <translation type="unfinished">Wordt verwijderd</translation>
     </message>
     <message id="whisperfish-resend-message">
         <location filename="../pages/MessagesView.qml" line="107"/>
@@ -314,7 +315,7 @@
     <message id="whisperfish-error-verify-contact">
         <location filename="../pages/NewMessage.qml" line="108"/>
         <source>Warning: could not verify contact in Signal</source>
-        <extracomment>Could not verify contact is registered with signal</extracomment>
+        <extracomment>Could verify contact is registered with signal</extracomment>
         <translation>Waarschuwing: kon niet verifiëren dat contact geregistreerd is bij Signal</translation>
     </message>
     <message id="whisperfish-recipient">
@@ -432,18 +433,21 @@
         <translation>Signal zal je bellen met een verificatiecode van 6 tekens. Zorg dat je deze ergens kan opschrijven.</translation>
     </message>
     <message id="whisperfish-reset-peer-accept">
+        <location filename="../pages/PeerIdentityChanged.qml" line="24"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="24"/>
         <source>Confirm</source>
         <extracomment>Reset peer identity accept text</extracomment>
         <translation>Bevestigen</translation>
     </message>
     <message id="whisperfish-peer-not-trusted">
+        <location filename="../pages/PeerIdentityChanged.qml" line="32"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="32"/>
         <source>Peer identity is not trusted</source>
         <extracomment>Peer identity not trusted</extracomment>
         <translation>Peeridentiteit is niet vertrouwd</translation>
     </message>
     <message id="whisperfish-peer-not-trusted-message">
+        <location filename="../pages/PeerIdentityChanged.qml" line="42"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="42"/>
         <source>WARNING: %1 identity is no longer trusted. Tap Confirm to reset peer identity.</source>
         <extracomment>Peer identity not trusted message</extracomment>

diff --git a/qml/i18n/whisperfish_pl.ts b/qml/i18n/whisperfish_pl.ts
@@ -34,19 +34,19 @@
         <translation>Nowa Wiadomość</translation>
     </message>
     <message id="whisperfish-session-section-today">
-        <location filename="../harbour-whisperfish.qml" line="128"/>
+        <location filename="../harbour-whisperfish.qml" line="131"/>
         <source>Today</source>
         <extracomment>Session section label for today</extracomment>
         <translation>Dziś</translation>
     </message>
     <message id="whisperfish-session-section-yesterday">
-        <location filename="../harbour-whisperfish.qml" line="132"/>
+        <location filename="../harbour-whisperfish.qml" line="135"/>
         <source>Yesterday</source>
         <extracomment>Session section label for yesterday</extracomment>
         <translation>Wczoraj</translation>
     </message>
     <message id="whisperfish-session-section-older">
-        <location filename="../harbour-whisperfish.qml" line="136"/>
+        <location filename="../harbour-whisperfish.qml" line="139"/>
         <source>Older</source>
         <extracomment>Session section label for older</extracomment>
         <translation>Starsze</translation>
@@ -253,9 +253,10 @@
     </message>
     <message id="whisperfish-delete-message">
         <location filename="../pages/MessagesView.qml" line="97"/>
-        <source>Deleting</source>
-        <extracomment>Deleting message remorse</extracomment>
-        <translation>Usuwanie</translation>
+        <source>Deleteing</source>
+        <oldsource>Deleting</oldsource>
+        <extracomment>Deleteing message remorse</extracomment>
+        <translation type="unfinished">Usuwanie</translation>
     </message>
     <message id="whisperfish-resend-message">
         <location filename="../pages/MessagesView.qml" line="107"/>
@@ -314,7 +315,7 @@
     <message id="whisperfish-error-verify-contact">
         <location filename="../pages/NewMessage.qml" line="108"/>
         <source>Warning: could not verify contact in Signal</source>
-        <extracomment>Could not verify contact is registered with signal</extracomment>
+        <extracomment>Could verify contact is registered with signal</extracomment>
         <translation>Ostrzeżenie: kontakt niezweryfikowany w Signal</translation>
     </message>
     <message id="whisperfish-recipient">
@@ -432,18 +433,21 @@
         <translation>Signal połączy się z Tobą, podając 6-cyfrowy kod weryfikacyjny. Przygotuj się na zanotowanie go.</translation>
     </message>
     <message id="whisperfish-reset-peer-accept">
+        <location filename="../pages/PeerIdentityChanged.qml" line="24"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="24"/>
         <source>Confirm</source>
         <extracomment>Reset peer identity accept text</extracomment>
         <translation>Potwierdź</translation>
     </message>
     <message id="whisperfish-peer-not-trusted">
+        <location filename="../pages/PeerIdentityChanged.qml" line="32"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="32"/>
         <source>Peer identity is not trusted</source>
         <extracomment>Peer identity not trusted</extracomment>
         <translation>Tożsamość odbiorcy nie jest zaufana</translation>
     </message>
     <message id="whisperfish-peer-not-trusted-message">
+        <location filename="../pages/PeerIdentityChanged.qml" line="42"/>
         <location filename="../pages/ResetPeerIdentity.qml" line="42"/>
         <source>WARNING: %1 identity is no longer trusted. Tap Confirm to reset peer identity.</source>
         <extracomment>Peer identity not trusted message</extracomment>

diff --git a/rpm/harbour-whisperfish.spec b/rpm/harbour-whisperfish.spec
@@ -1,7 +1,7 @@
 
 Name:       harbour-whisperfish
 Summary:    Signal client for SailfishOS
-Version:    0.4.3
+Version:    0.4.4
 Release:    1
 Group:      Qt/Qt
 License:    GPL

diff --git a/worker/client.go b/worker/client.go
@@ -25,9 +25,9 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/aebruno/textsecure"
+	"github.com/aebruno/textsecure/axolotl"
 	"github.com/aebruno/whisperfish/settings"
 	"github.com/aebruno/whisperfish/store"
-	"github.com/janimo/textsecure/axolotl"
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/network"
 )

diff --git a/worker/send.go b/worker/send.go
@@ -25,8 +25,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/aebruno/textsecure"
+	"github.com/aebruno/textsecure/axolotl"
 	"github.com/aebruno/whisperfish/store"
-	"github.com/janimo/textsecure/axolotl"
 	"github.com/therecipe/qt/core"
 )