diff --git a/go.mod b/go.mod index 49a09577..162d160d 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module cwtch.im/ui go 1.12 require ( - cwtch.im/cwtch v0.4.9 - git.openprivacy.ca/openprivacy/connectivity v1.3.2 + cwtch.im/cwtch v0.4.10 + git.openprivacy.ca/openprivacy/connectivity v1.3.3 git.openprivacy.ca/openprivacy/log v1.0.1 github.com/c-bata/go-prompt v0.2.3 // indirect github.com/google/go-cmp v0.4.0 // indirect diff --git a/go.sum b/go.sum index 10684e77..8148bcaf 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,8 @@ cwtch.im/cwtch v0.4.8 h1:f/FIek3PkJMskLT+f7SpIjpjlp5hMspAnGguXC3SA8s= cwtch.im/cwtch v0.4.8/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY= cwtch.im/cwtch v0.4.9 h1:X/6r5rARHSEjk4h0ZPw9NA/oFa+XdWgih0zEdrier40= cwtch.im/cwtch v0.4.9/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY= +cwtch.im/cwtch v0.4.10 h1:sgEyJRY+ck3otC+mc4bgCcUWBHhZGbPWdXK0oP+xXIk= +cwtch.im/cwtch v0.4.10/go.mod h1:snHZIZwRQPAZG2LRZsN5SpAIbeR597VJoDS+KHm7q9w= cwtch.im/tapir v0.2.0 h1:7MkoR5+uEuPW34/O0GZRidnIjq/01Cfm8nl5IRuqpGc= cwtch.im/tapir v0.2.0/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ= cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw= @@ -32,6 +34,8 @@ git.openprivacy.ca/openprivacy/connectivity v1.3.1 h1:d1t7rtzn+Fc63Z2M4mAGmGYU8h git.openprivacy.ca/openprivacy/connectivity v1.3.1/go.mod h1:s0/QhONuUqJQfYTAgUlu+ya7G3Ov6bKgpT5QkOhVxDI= git.openprivacy.ca/openprivacy/connectivity v1.3.2 h1:gbQ0YsrghzPEtIYBbI1/+S66l8AzuMM/G0XZiq9uPWI= git.openprivacy.ca/openprivacy/connectivity v1.3.2/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90= +git.openprivacy.ca/openprivacy/connectivity v1.3.3 h1:OKHZ/pzY95+UNOhF74DisSYPh7lULtjbxFQnK9r6cAk= +git.openprivacy.ca/openprivacy/connectivity v1.3.3/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90= git.openprivacy.ca/openprivacy/log v1.0.0/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= git.openprivacy.ca/openprivacy/log v1.0.1 h1:NWV5oBTatvlSzUE6wtB+UQCulgyMOtm4BXGd34evMys= git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= diff --git a/go/handlers/appHandler.go b/go/handlers/appHandler.go index 99619cba..abd24ed2 100644 --- a/go/handlers/appHandler.go +++ b/go/handlers/appHandler.go @@ -21,8 +21,10 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts the.AppBus.Subscribe(event.AppError, q) the.AppBus.Subscribe(event.ACNStatus, q) the.AppBus.Subscribe(event.ReloadDone, q) + the.AppBus.Subscribe(event.ACNVersion, q) subscribed <- true + the.CwtchApp.QueryACNVersion() gcd.Loaded() for { @@ -46,7 +48,9 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts statuscode = 3 } gcd.SetTorStatus(statuscode) - + case event.ACNVersion: + version := e.Data[event.Data] + gcd.SetTorVersion(version) case event.PeerError: // current only case log.Errorf("couldn't load profiles: %v", e.Data[event.Error]) diff --git a/go/ui/gcd.go b/go/ui/gcd.go index 39458ab9..f0c96d5f 100644 --- a/go/ui/gcd.go +++ b/go/ui/gcd.go @@ -23,7 +23,7 @@ import ( type GrandCentralDispatcher struct { core.QObject - AndroidCwtchActivity *android.CwtchActivity + AndroidCwtchActivity *android.CwtchActivity QMLEngine *qml.QQmlApplicationEngine Translator, OpaqueTranslator *core.QTranslator @@ -45,6 +45,7 @@ type GrandCentralDispatcher struct { _ string `property:"theme,auto,changed"` _ string `property:"locale,auto,changed"` _ string `property:"version"` + _ string `property:"torVersion"` _ string `property:"buildDate"` _ string `property:"assetPath"` _ string `property:"selectedProfile,auto"` @@ -60,7 +61,7 @@ type GrandCentralDispatcher struct { _ func() `signal:"ResetProfileList"` _ func(failed bool) `signal:"ChangePasswordResponse"` _ func(onion string, online bool) `signal:"UpdateProfileNetworkStatus"` - _ func(onion string) `signal:"Notify"` + _ func(onion string) `signal:"Notify"` // server management _ func(handle, displayname, image string, status int, autostart bool, bundle string, messages int, key_types []string, keys []string) `signal:"AddServer"` diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts index c27fa42e..dba7912c 100644 --- a/i18n/translation_de.ts +++ b/i18n/translation_de.ts @@ -105,18 +105,18 @@ Name BulletinOverlay - + new-bulletin-label Neue Meldung - + post-new-bulletin-label Post a new Bulletin Post Neue Meldung veröffentlichen - + title-placeholder title place holder text Titel... @@ -233,18 +233,18 @@ Name noch zu erledigen - + search-list ex: "... paste an address here to add a contact ..." - + peer-not-online - + add-list-item-btn @@ -252,7 +252,7 @@ Name MembershipOverlay - + membership-description Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group. Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben. Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben. @@ -267,18 +267,18 @@ Name Klicken, um DM zu senden - + could-not-send-msg-error Could not send this message Nachricht konnte nicht gesendet werden - + acknowledged-label bestätigt - + pending-label Bestätigung ausstehend @@ -286,13 +286,13 @@ Name MessageEditor - + peer-blocked-message Peer is blocked - + peer-offline-message Peer is offline, messages can't be delivered right now @@ -659,8 +659,8 @@ Name - version %1 - Version %1 + version %1 tor %2 + Version %1 with tor %2 @@ -719,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm index eb00a31c..f9ca9f9a 100644 Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts index 59a7ed6d..4f845ddf 100644 --- a/i18n/translation_en.ts +++ b/i18n/translation_en.ts @@ -118,18 +118,18 @@ Name BulletinOverlay - + new-bulletin-label New Bulletin - + post-new-bulletin-label Post a new Bulletin Post Post new bulletin - + title-placeholder title place holder text title... @@ -326,18 +326,18 @@ Right-click to reset. ListOverlay - + search-list ex: "... paste an address here to add a contact ..." Search List - + peer-not-online Peer is Offline. Applications cannot be used right now. - + add-list-item-btn Add Item @@ -345,7 +345,7 @@ Right-click to reset. MembershipOverlay - + membership-description Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group. Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group. @@ -360,18 +360,18 @@ Right-click to reset. Click to DM - + could-not-send-msg-error Could not send this message Could not send this message - + acknowledged-label Acknowledged - + pending-label Pending @@ -379,13 +379,13 @@ Right-click to reset. MessageEditor - + peer-blocked-message Peer is blocked Peer is blocked - + peer-offline-message Peer is offline, messages can't be delivered right now Peer is offline, messages can't be delivered right now @@ -787,9 +787,14 @@ Right-click to reset. + version %1 tor %2 + Version %1 with tor %2 + Version %1 with tor %2 + + version %1 Version %1 - Version %1 + Version %1 @@ -855,7 +860,7 @@ Right-click to reset. main - + new-connection-pane-title New Connection New Connection diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts index 6d65ff5b..79b53bb9 100644 --- a/i18n/translation_fr.ts +++ b/i18n/translation_fr.ts @@ -105,18 +105,18 @@ Name BulletinOverlay - + new-bulletin-label Nouveau bulletin - + post-new-bulletin-label Post a new Bulletin Post Envoyer un nouveau bulletin - + title-placeholder title place holder text titre... @@ -233,18 +233,18 @@ Name A faire... - + search-list ex: "... paste an address here to add a contact ..." - + peer-not-online - + add-list-item-btn @@ -252,7 +252,7 @@ Name MembershipOverlay - + membership-description Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group. Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être representatives de l'ensemble des membres du groupe. @@ -267,18 +267,18 @@ Name Envoyer un message privé - + could-not-send-msg-error Could not send this message Impossible d'envoyer ce message - + acknowledged-label Confirmé - + pending-label En attente @@ -286,13 +286,13 @@ Name MessageEditor - + peer-blocked-message Peer is blocked - + peer-offline-message Peer is offline, messages can't be delivered right now @@ -659,8 +659,8 @@ Name - version %1 - Version %1 + version %1 tor %2 + Version %1 with tor %2 @@ -719,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts index d18c42f1..96d83873 100644 --- a/i18n/translation_pt.ts +++ b/i18n/translation_pt.ts @@ -105,18 +105,18 @@ Name BulletinOverlay - + new-bulletin-label Novo Boletim - + post-new-bulletin-label Post a new Bulletin Post Postar novo boletim - + title-placeholder title place holder text título… @@ -233,18 +233,18 @@ Name Afazer… - + search-list ex: "... paste an address here to add a contact ..." - + peer-not-online - + add-list-item-btn @@ -252,7 +252,7 @@ Name MembershipOverlay - + membership-description Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group. A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo. @@ -267,18 +267,18 @@ Name Clique para DM - + could-not-send-msg-error Could not send this message Não deu para enviar esta mensagem - + acknowledged-label Confirmada - + pending-label Pendente @@ -286,13 +286,13 @@ Name MessageEditor - + peer-blocked-message Peer is blocked - + peer-offline-message Peer is offline, messages can't be delivered right now @@ -659,8 +659,8 @@ Name - version %1 - Version %1 + version %1 tor %2 + Version %1 with tor %2 @@ -719,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/qml/panes/SettingsPane.qml b/qml/panes/SettingsPane.qml index 0271cb7b..8d14748b 100644 --- a/qml/panes/SettingsPane.qml +++ b/qml/panes/SettingsPane.qml @@ -158,8 +158,8 @@ Opaque.SettingsList { // settingsPane Opaque.ScalingLabel { id: versionLabel anchors.horizontalCenter: parent.horizontalCenter - //: Version %1 - text: qsTr("version %1").arg(gcd.version) + //: Version %1 with tor %2 + text: qsTr("version %1 tor %2").arg(gcd.version).arg(gcd.torVersion) } Opaque.ScalingLabel {