cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Using connectivity NoTorrcErr typed error and stubbing torrc #326

Closed
dan wants to merge 2 commits from (deleted):notorrcerr into tapir-server
pull from: (deleted):notorrcerr
merge into: cwtch.im:tapir-server
Conversation 0 Commits 2 Files Changed 22 +452 -138
22 changed files with 452 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ android:
linux_build:
date
qtdeploy -qt_version "5.13.0" build linux 2>&1 | tee qtdeploy.log | pv
qtdeploy -qt_version "5.13.2" build linux 2>&1 | tee qtdeploy.log | pv
date
cp -R assets deploy/linux/
$(MAKE) linux_clean

5
go.mod
View File

@ -4,7 +4,7 @@ go 1.12
require (
cwtch.im/cwtch v0.3.16
git.openprivacy.ca/openprivacy/connectivity v1.1.4
git.openprivacy.ca/openprivacy/connectivity v1.2.1
git.openprivacy.ca/openprivacy/log v1.0.1
github.com/gopherjs/gopherjs v0.0.0-20200209183636-89e6cbcd0b6d // indirect
github.com/therecipe/qt v0.0.0-20200126204426-5074eb6d8c41
@ -12,3 +12,6 @@ require (
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200126204426-5074eb6d8c41 // indirect
golang.org/x/crypto v0.0.0-20200420104511-884d27f42877 // indirect
)
replace cwtch.im/cwtch => /home/dan/src/go/src/cwtch.im/cwtch

4
go.sum
View File

@ -14,6 +14,8 @@ cwtch.im/tapir v0.1.17 h1:2jVZUe1a88tMI4aJPvRTO4Id3NN3PsM62cT5lntEChk=
cwtch.im/tapir v0.1.17/go.mod h1:HzezugpEx+nZ3LdyDsl0w6n45IJYnOt8uqldkLWmaqs=
cwtch.im/tapir v0.1.18 h1:Fs/jL9ZRyel/A1D/BYzIPEVQau8y5BJg44yA+GQDbSM=
cwtch.im/tapir v0.1.18/go.mod h1:/IrAI6CBHfgzsfgRT8WHVb1P9fCCz7+45hfsdkKn8Zg=
cwtch.im/tapir v0.2.0 h1:7MkoR5+uEuPW34/O0GZRidnIjq/01Cfm8nl5IRuqpGc=
cwtch.im/tapir v0.2.0/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ=
git.openprivacy.ca/openprivacy/connectivity v1.1.0/go.mod h1:4P8mirZZslKbo2zBrXXVjgEdqGwHo/6qoFBwFQW6d6E=
git.openprivacy.ca/openprivacy/connectivity v1.1.1 h1:hKxBOmxP7Jdu3K1BJ93mRtKNiWUoP6YHt/o2snE2Z0w=
git.openprivacy.ca/openprivacy/connectivity v1.1.1/go.mod h1:4P8mirZZslKbo2zBrXXVjgEdqGwHo/6qoFBwFQW6d6E=
@ -25,6 +27,8 @@ git.openprivacy.ca/openprivacy/connectivity v1.1.4 h1:/I9epvNNjM8rR/q5y9Y63D9/aP
git.openprivacy.ca/openprivacy/connectivity v1.1.4/go.mod h1:4P8mirZZslKbo2zBrXXVjgEdqGwHo/6qoFBwFQW6d6E=
git.openprivacy.ca/openprivacy/connectivity v1.2.0 h1:dbZ5CRl11vg3BNHdzRKSlDP8OUtDB+mf6FkxMVf73qw=
git.openprivacy.ca/openprivacy/connectivity v1.2.0/go.mod h1:B7vzuVmChJtSKoh0ezph5vu6DQ0gIk0zHUNG6IgXCcA=
git.openprivacy.ca/openprivacy/connectivity v1.2.1 h1:oRL56TR9ZQnKkGkTIQ9wYbJ2IkOOsi/zLYExYiAS+sE=
git.openprivacy.ca/openprivacy/connectivity v1.2.1/go.mod h1:B7vzuVmChJtSKoh0ezph5vu6DQ0gIk0zHUNG6IgXCcA=
git.openprivacy.ca/openprivacy/libricochet-go v1.0.11 h1:C7QFFzG0p5XKu0zcOIdLGwEpA9uU0BceBM7CfVK5D40=
git.openprivacy.ca/openprivacy/libricochet-go v1.0.11/go.mod h1:yTMps/ZpYS+BNBBvANsNAft28FXrBvFHQauMYNWPrwE=
git.openprivacy.ca/openprivacy/libricochet-go v1.0.13 h1:Z86uL9K47onznY1wP1P/wWfWMbbyvk6xnCp94R180os=

1
go/handlers/appHandler.go
View File

@ -87,7 +87,6 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
if e.Data[event.Status] != "running" {
p.Listen()
p.StartPeersConnections()
p.StartGroupConnections()
}
blockUnkownPeers, exists := p.GetAttribute(constants.BlockUnknownPeersSetting)

2
go/handlers/peerHandler.go
View File

@ -127,7 +127,7 @@ func PeerHandler(onion string, uiManager ui.Manager, subscribed chan bool) {
if state == connections.AUTHENTICATED {
loading = true
}
uiManager.UpdateContactStatus(group.GroupID, int(state), loading)
uiManager.UpdateContactStatus(serverOnion, int(state), loading)
} else {
log.Errorf("found group that is nil :/")
}

54
go/ui/gcd.go
View File

@ -1,6 +1,7 @@
package ui
import (
"encoding/base64"
"sync"
"cwtch.im/cwtch/app"
@ -82,6 +83,7 @@ type GrandCentralDispatcher struct {
_ func(locale string, zoom float32, theme string) `signal:"SupplySettings"`
_ func(groupID, name, server, invitation string, accepted bool, addrbooknames, addrbookaddrs []string) `signal:"SupplyGroupSettings"`
_ func(onion, nick string, authorization string, storage string) `signal:"SupplyPeerSettings"`
_ func(server string, key_types []string, keys []string) `signal:"SupplyServerSettings"`
// signals emitted from the ui (written in go, below)
// ui
@ -118,6 +120,8 @@ type GrandCentralDispatcher struct {
_ func(onion string) `signal:"storeHistoryForPeer,auto"`
_ func(onion string) `signal:"deleteHistoryForPeer,auto"`
_ func(handle string) `signal:"requestServerSettings,auto"`
_ func() `constructor:"init"`
}
@ -380,6 +384,31 @@ func (this *GrandCentralDispatcher) deleteHistoryForPeer(onion string) {
the.Peer.SetContactAttribute(onion, event.SaveHistoryKey, event.DeleteHistoryConfirmed)
}
func (this *GrandCentralDispatcher) requestServerSettings(groupID string) {
group := the.Peer.GetGroup(groupID)
if group == nil {
log.Errorf("couldn't find group %v", groupID)
return
}
serverInfo := the.Peer.GetContact(group.GroupServer)
key_types := []model.KeyType{model.KeyTypeServerOnion, model.KeyTypeTokenOnion, model.KeyTypePrivacyPass}
var keyNames []string
var keys []string
for _,key_type := range key_types {
log.Debugf("Looking up %v %v", key_type, keyNames)
if key,has := serverInfo.GetAttribute(string(key_type)); has {
keyNames = append(keyNames, string(key_type))
keys = append(keys, key)
}
}
this.SupplyServerSettings(group.GroupServer, keyNames, keys)
}
func (this *GrandCentralDispatcher) requestGroupSettings(groupID string) {
group := the.Peer.GetGroup(groupID)
@ -397,6 +426,9 @@ func (this *GrandCentralDispatcher) requestGroupSettings(groupID string) {
contactnames[i] = getNick(contact)
}
this.SupplyGroupSettings(group.GroupID, nick, group.GroupServer, invite, group.Accepted, contactnames, contactaddrs)
status := connections.ConnectionStateToType[group.State]
log.Debugf("Sending New Group Status: %v %v", group.GroupServer, status)
this.UpdateContactStatus(group.GroupServer, int(status), false)
}
func (this *GrandCentralDispatcher) saveGroupSettings(groupID, nick string) {
@ -429,6 +461,23 @@ func (this *GrandCentralDispatcher) importString(str string) {
return
}
// Server Key Bundles are prefixed with
if strings.HasPrefix(str, "server:") {
bundle, err := base64.StdEncoding.DecodeString(str[7:])
if err == nil {
err := the.Peer.AddServer(string(bundle))
if err == nil {
this.InvokePopup("Successfully Imported Server Key Bundle")
return
}
this.InvokePopup("Error Importing Server Key Bundle: " + err.Error())
return
}
this.InvokePopup("Invalid Server Key Bundle: " + err.Error())
return
}
log.Debugf("importing: %s\n", str)
onion := str
name := onion
@ -441,6 +490,7 @@ func (this *GrandCentralDispatcher) importString(str string) {
this.InvokePopup("not a valid group invite")
return
}
return
}
@ -650,7 +700,9 @@ func (this *GrandCentralDispatcher) loadProfile(onion string) {
contacts := the.Peer.GetContacts()
for i := range contacts {
this.GetUiManager(this.selectedProfile()).AddContact(contacts[i])
if the.Peer.GetContact(contacts[i]).IsServer() == false {
this.GetUiManager(this.selectedProfile()).AddContact(contacts[i])
}
}
groups := the.Peer.GetGroups()

11
go/ui/manager.go
View File

@ -14,11 +14,18 @@ import (
)
func isGroup(id string) bool {
return len(id) == 32
return len(id) == 32 && !isServer(id)
}
func isPeer(id string) bool {
return len(id) == 56
return len(id) == 56 && !isServer(id)
}
// Check if the id is associated with a contact with a KeyTypeServerOnion attribute (which indicates that this
// is a server, not a regular contact or a group
func isServer(id string) bool {
_,ok := the.Peer.GetContactAttribute(id, string(model.KeyTypeServerOnion))
return ok
}
func getOrDefault(id, key string, defaultVal string) string {

BIN
i18n/translation_de.qm
View File

Binary file not shown.

51
i18n/translation_de.ts
View File

@ -69,44 +69,69 @@
<context>
<name>GroupSettingsPane</name>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="33"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="43"/>
<source>server-label</source>
<translation>Server</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="44"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="65"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="48"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="66"/>
<source>copy-btn</source>
<translation>Kopieren</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="54"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="52"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="70"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">in die Zwischenablage kopiert</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="61"/>
<source>invitation-label</source>
<translation>Einladung</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="75"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="80"/>
<source>server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="88"/>
<source>server-connectiivity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="104"/>
<source>server-synced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="118"/>
<source>view-server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="26"/>
<source>group-name-label</source>
<translation>Gruppenname</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="31"/>
<source>save-btn</source>
<translation>Speichern</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="94"/>
<source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment>
<translation>In die Gruppe einladen</translation>
<translation type="vanished">In die Gruppe einladen</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="105"/>
<source>invite-btn</source>
<translation>Einladen</translation>
<translation type="vanished">Einladen</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="138"/>
<source>delete-btn</source>
<translation>Löschen</translation>
</message>
@ -184,7 +209,7 @@
<message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment>
<extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -418,7 +443,7 @@
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>

BIN
i18n/translation_en.qm
View File

Binary file not shown.

51
i18n/translation_en.ts
View File

@ -157,44 +157,69 @@ Right-click to reset.</translation>
<context>
<name>GroupSettingsPane</name>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="33"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="43"/>
<source>server-label</source>
<translation>Server</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="44"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="65"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="48"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="66"/>
<source>copy-btn</source>
<translation>Copy</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="54"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="52"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="70"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">Copied to Clipboard</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="61"/>
<source>invitation-label</source>
<translation>Invitation</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="75"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="80"/>
<source>server-info</source>
<translation>Server Information</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="88"/>
<source>server-connectiivity</source>
<translation>Connected to Server</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="104"/>
<source>server-synced</source>
<translation>Synchronized</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="118"/>
<source>view-server-info</source>
<translation>View Server Settings</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="26"/>
<source>group-name-label</source>
<translation>Group Name</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="31"/>
<source>save-btn</source>
<translation>Save</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="94"/>
<source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment>
<translation>Invite to group</translation>
<translation type="vanished">Invite to group</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="105"/>
<source>invite-btn</source>
<translation>Invite</translation>
<translation type="vanished">Invite</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="138"/>
<source>delete-btn</source>
<translation>Delete</translation>
</message>
@ -264,7 +289,7 @@ Right-click to reset.</translation>
<message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment>
<extracomment>Peer is blocked</extracomment>
<translation>Peer is blocked</translation>
</message>
<message>
@ -510,7 +535,7 @@ Right-click to reset.</translation>
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source>
<translation>Add new profile</translation>
</message>

BIN
i18n/translation_fr.qm
View File

Binary file not shown.

51
i18n/translation_fr.ts
View File

@ -69,44 +69,69 @@
<context>
<name>GroupSettingsPane</name>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="33"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="43"/>
<source>server-label</source>
<translation>Serveur</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="44"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="65"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="48"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="66"/>
<source>copy-btn</source>
<translation>Copier</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="54"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="52"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="70"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">Copié dans le presse-papier</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="61"/>
<source>invitation-label</source>
<translation>Invitation</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="75"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="80"/>
<source>server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="88"/>
<source>server-connectiivity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="104"/>
<source>server-synced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="118"/>
<source>view-server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="26"/>
<source>group-name-label</source>
<translation>Nom du groupe</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="31"/>
<source>save-btn</source>
<translation>Sauvegarder</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="94"/>
<source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment>
<translation>Inviter quelqu&apos;un</translation>
<translation type="vanished">Inviter quelqu&apos;un</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="105"/>
<source>invite-btn</source>
<translation>Invitation</translation>
<translation type="vanished">Invitation</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="138"/>
<source>delete-btn</source>
<translation>Effacer</translation>
</message>
@ -184,7 +209,7 @@
<message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment>
<extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -418,7 +443,7 @@
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>

BIN
i18n/translation_pt.qm
View File

Binary file not shown.

51
i18n/translation_pt.ts
View File

@ -69,44 +69,69 @@
<context>
<name>GroupSettingsPane</name>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="33"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="43"/>
<source>server-label</source>
<translation>Servidor</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="44"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="65"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="48"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="66"/>
<source>copy-btn</source>
<translation>Copiar</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="54"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="52"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="70"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">Copiado</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="61"/>
<source>invitation-label</source>
<translation>Convite</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="75"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="80"/>
<source>server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="88"/>
<source>server-connectiivity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="104"/>
<source>server-synced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="118"/>
<source>view-server-info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="26"/>
<source>group-name-label</source>
<translation>Nome do Grupo</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="31"/>
<source>save-btn</source>
<translation>Salvar</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="94"/>
<source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment>
<translation>Convidar ao grupo</translation>
<translation type="vanished">Convidar ao grupo</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="105"/>
<source>invite-btn</source>
<translation>Convidar</translation>
<translation type="vanished">Convidar</translation>
</message>
<message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="138"/>
<source>delete-btn</source>
<translation>Deletar</translation>
</message>
@ -184,7 +209,7 @@
<message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment>
<extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -418,7 +443,7 @@
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>

15
main.go
View File

@ -8,6 +8,7 @@ import (
"cwtch.im/ui/go/ui"
"cwtch.im/ui/go/ui/android"
"flag"
"fmt"
"git.openprivacy.ca/openprivacy/connectivity/tor"
"git.openprivacy.ca/openprivacy/log"
"github.com/therecipe/qt/androidextras"
@ -16,6 +17,8 @@ import (
"github.com/therecipe/qt/network"
"github.com/therecipe/qt/qml"
"github.com/therecipe/qt/quickcontrols2"
"io/ioutil"
"math/rand"
"os"
"os/user"
"path"
@ -65,7 +68,7 @@ func main() {
log.ExcludeFromPattern("service.go")
log.ExcludeFromPattern("tor/BaseOnionService.go")
log.ExcludeFromPattern("applications/auth.go")
log.ExcludeFromPattern("connections/engine.go")
//log.ExcludeFromPattern("connections/engine.go")
if os.Getenv("CWTCH_FOLDER") != "" {
the.CwtchDir = os.Getenv("CWTCH_FOLDER")
@ -233,6 +236,16 @@ func loadACN() {
}
var err error
the.ACN, err = tor.NewTorACN(the.CwtchDir, torpath)
if _, ok := err.(*tor.NoTorrcError); ok {
// Stopgap: just dump a basic torrc for now
port := rand.Intn(1000) + 9600
controlPort := port + 1
ioutil.WriteFile(path.Join(the.CwtchDir, "tor", "torrc"), []byte(fmt.Sprintf(`SOCKSPort %v \
ControlPort %v`, port, controlPort)), 0600)
the.ACN, err = tor.NewTorACNWithAuth(the.CwtchDir, torpath, controlPort, tor.NullAuthenticator{})
}
if err != nil {
// TODO: turn into UI error: status panel?
log.Errorf("Could not start Tor: %v", err)

7
qml/main.qml
View File

@ -111,6 +111,7 @@ ApplicationWindow {
readonly property int settingsPane: 2
readonly property int addEditProfilePane: 3
readonly property int profilePane: 4
readonly property int serverPane: 5
property alias pane: parentStack.currentIndex
Rectangle { // Splash pane
@ -164,7 +165,6 @@ ApplicationWindow {
}
}
RowLayout { // Profile Pane (contact list + overlays)
Layout.fillHeight: true
Layout.fillWidth: true
@ -215,6 +215,7 @@ ApplicationWindow {
readonly property int userProfilePane: 2
readonly property int groupProfilePane: 3
readonly property int addGroupPane: 4
readonly property int serverInfoPane: 5
Item { anchors.fill: parent } // empty
@ -235,6 +236,8 @@ ApplicationWindow {
AddGroupPane { anchors.fill: parent }
ServerInfoPane {anchors.fill :parent}
onCurrentIndexChanged: {
parentStack.updateToolbar()
if (currentIndex == emptyPane) {
@ -316,7 +319,7 @@ ApplicationWindow {
gcd.selectedProfile = "none"
gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane
} else if (theStack.currentIndex == theStack.userProfilePane || theStack.currentIndex == theStack.groupProfilePane) {
} else if (theStack.currentIndex == theStack.userProfilePane || theStack.currentIndex == theStack.groupProfilePane ) {
theStack.currentIndex = theStack.messagePane
} else {
theStack.currentIndex = theStack.emptyPane

2
qml/opaque

@ -1 +1 @@
Subproject commit ec21dcbf8e20f4f894ba0dc829ccf18f56e0d27a
Subproject commit 5c33d6ed2c46f5fe039fc6fee3cb690cb562cb23

189
qml/panes/GroupSettingsPane.qml
View File

@ -9,128 +9,175 @@ import QtQuick.Controls 1.4
import "../opaque" as Opaque
import "../opaque/styles"
import "../utils.js" as Utils
import "../opaque/theme"
import "../const"
ColumnLayout { // groupSettingsPane
Opaque.SettingsList { // groupSettingsPane
id: gsp
anchors.fill: parent
property string groupID
property variant addrbook
Flickable {
settings: Column {
anchors.fill: parent
boundsBehavior: Flickable.StopAtBounds
clip:true
contentWidth: tehcol.width
contentHeight: tehcol.height
Column {
id: tehcol
width: gsp.width
leftPadding: 10
spacing: 5
Opaque.ScalingLabel {
text: qsTr("server-label") + ":"
}
TextField {
id: txtServer
style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
readOnly: true
}
Opaque.Button {
icon: "regular/clipboard"
text: qsTr("copy-btn")
Opaque.Setting {
inline: false
label: qsTr("group-name-label")
field: Opaque.ButtonTextField {
id: txtGroupName
readOnly: false
button_text: qsTr("save-btn")
dropShadowColor: Theme.dropShadowPaneColor
onClicked: {
gcd.popup("copied-clipboard-notification")
//: notification: copied to clipboard
gcd.saveGroupSettings(groupID, txtGroupName.text)
theStack.title = txtGroupName.text
}
}
}
Opaque.Setting {
inline: false
label: qsTr("server-label")
field: Opaque.ButtonTextField {
id: txtServer
readOnly: true
button_text: qsTr("copy-btn")
dropShadowColor: Theme.dropShadowPaneColor
onClicked: {
//: notification: copied to clipboard
gcd.popup(qsTr("copied-to-clipboard-notification"))
txtServer.selectAll()
txtServer.copy()
}
}
}
Opaque.ScalingLabel {
text: qsTr("invitation-label") + ":"
}
Opaque.Setting {
inline: false
label: qsTr("invitation-label")
TextField {
field: Opaque.ButtonTextField {
id: txtInvitation
style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
readOnly: true
}
Opaque.Button {
icon: "regular/clipboard"
text: qsTr("copy-btn")
button_text: qsTr("copy-btn")
dropShadowColor: Theme.dropShadowPaneColor
onClicked: {
gcd.popup("copied-clipboard-notification")
//: notification: copied to clipboard
gcd.popup(qsTr("copied-to-clipboard-notification"))
txtInvitation.selectAll()
txtInvitation.copy()
}
}
}
Opaque.ScalingLabel{
text: qsTr("group-name-label") + ":"
}
Opaque.Setting {
property color backgroundColor: parent.color
inline: true
label: qsTr("server-info")
field: Column {
width: parent.width
spacing:10
RowLayout {
width: parent.width
Layout.fillWidth: true
Opaque.ScalingLabel {
text: qsTr("server-connectiivity")
Layout.alignment: Qt.AlignLeft
}
Opaque.Icon {
backgroundColor: Theme.backgroundPaneColor
id: serverStatusIcon
height: 18
width: 18
Layout.alignment: Qt.AlignRight
}
}
RowLayout {
width: parent.width
Layout.fillWidth: true
TextField {
id: txtGroupName
style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
}
Opaque.ScalingLabel {
text: qsTr("server-synced")
Layout.alignment: Qt.AlignLeft
}
Opaque.Icon {
id: serverSyncedStatusIcon
backgroundColor: Theme.backgroundPaneColor
height: 18
width: 18
Layout.alignment: Qt.AlignRight
}
}
Opaque.Button {
text: qsTr("save-btn")
Opaque.Button {
icon: "regular/hdd"
text: qsTr("view-server-info")
anchors.right: parent.right
onClicked: {
gcd.saveGroupSettings(groupID, txtGroupName.text)
theStack.title = txtGroupName.text
theStack.pane = theStack.messagePane
}
}
onClicked: {
gcd.requestServerSettings(gcd.selectedConversation)
theStack.pane = theStack.serverInfoPane
}
}
//: Invite someone to the group
Opaque.ScalingLabel { text: qsTr("invite-to-group-label") }
}
}
ComboBox {
id: cbInvite
//popup.font.pixelSize: 12
width: 200
//font.pixelSize: 20
style: CwtchComboBoxStyle{}
}
Opaque.Button {
text: qsTr("invite-btn")
onClicked: {
gcd.inviteToGroup(addrbook[cbInvite.currentIndex], groupID)
}
}
Column {
width:parent.width * 0.95
anchors.horizontalCenter: parent.horizontalCenter
Opaque.Button {
icon: "regular/trash-alt"
text: qsTr("delete-btn")
anchors.right: parent.right
onClicked: {
gcd.leaveGroup(groupID)
theStack.pane = theStack.emptyPane
}
}
}
}//end of column with padding
}//end of flickable
}
Connections {
target: gcd
onUpdateContactStatus: function(_handle, _status, _loading) {
if (txtServer.text == _handle) {
if (_status >= Const.state_connected) {
serverStatusIcon.iconColor = Theme.statusbarOnlineFontColor
serverStatusIcon.source = gcd.assetPath + "core/signal_cellular_4_bar-24px.svg"
if (_status != Const.state_synced) {
serverSyncedStatusIcon.iconColor = Theme.statusbarConnectingFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-03.svg"
} else {
serverSyncedStatusIcon.iconColor = Theme.statusbarOnlineFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-01.svg"
}
} else {
serverStatusIcon.iconColor = Theme.statusbarDisconnectedTorFontColor
serverStatusIcon.source = gcd.assetPath + "core/signal_cellular_connected_no_internet_4_bar-24px.svg"
serverSyncedStatusIcon.iconColor = Theme.statusbarDisconnectedTorFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-03.svg"
}
}
}
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
gsp.groupID = gid
txtGroupName.text = name
txtServer.text = server
txtInvitation.text = invite
cbInvite.model = addrbooknames.map(function(e){return Utils.htmlEscaped(e)})
//cbInvite.model = addrbooknames.map(function(e){return Utils.htmlEscaped(e)})
addrbook = addrbookaddrs
}
}

14
qml/panes/OverlayPane.qml
View File

@ -33,10 +33,10 @@ ColumnLayout {
//: Accept group invite button
text: qsTr("accept-group-btn")
icon: "regular/heart"
onClicked: {
gcd.acceptGroup(gcd.selectedConversation)
gcd.requestGroupSettings(gcd.selectedConversation)
}
onClicked: {
gcd.acceptGroup(gcd.selectedConversation)
gcd.requestGroupSettings(gcd.selectedConversation)
}
}
Opaque.Button {
@ -147,5 +147,11 @@ ColumnLayout {
overlay.accepted = accepted
overlay.inGroup = true
}
onSupplyServerSettings: function(server) {
overlay.name = server
}
}
}

78
qml/panes/ServerInfoPane.qml Normal file
View File

@ -0,0 +1,78 @@
import QtGraphicalEffects 1.0
import QtQuick 2.7
import QtQuick.Controls 2.4
import QtQuick.Controls.Material 2.0
import QtQuick.Layouts 1.3
import QtQuick.Window 2.11
import QtQuick.Controls 1.4
import "../opaque" as Opaque
import "../opaque/styles"
import "../utils.js" as Utils
import "../opaque/theme"
import "../const"
Opaque.SettingsList { // groupSettingsPane
id: gsp
anchors.fill: parent
property string serverName
property color backgroundColor: parent.color
settings: Column {
anchors.fill: parent
Opaque.Setting {
inline: false
label: qsTr("server-label")
field: Opaque.ButtonTextField {
id: txtServer
readOnly: true
text: serverName;
button_text: qsTr("copy-btn")
dropShadowColor: Theme.dropShadowPaneColor
onClicked: {
//: notification: copied to clipboard
gcd.popup(qsTr("copied-to-clipboard-notification"))
txtServer.selectAll()
txtServer.copy()
}
}
}
}
Connections {
target: gcd
onUpdateContactStatus: function(_handle, _status, _loading) {
if (txtServer.text == _handle) {
if (_status >= Const.state_connected) {
serverStatusIcon.iconColor = Theme.statusbarOnlineFontColor
serverStatusIcon.source = gcd.assetPath + "core/signal_cellular_4_bar-24px.svg"
if (_status != Const.state_synced) {
serverSyncedStatusIcon.iconColor = Theme.statusbarConnectingFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-03.svg"
} else {
serverSyncedStatusIcon.iconColor = Theme.statusbarOnlineFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-01.svg"
}
} else {
serverStatusIcon.iconColor = Theme.statusbarDisconnectedTorFontColor
serverStatusIcon.source = gcd.assetPath + "core/signal_cellular_connected_no_internet_4_bar-24px.svg"
serverSyncedStatusIcon.iconColor = Theme.statusbarDisconnectedTorFontColor
serverSyncedStatusIcon.source = gcd.assetPath + "core/syncing-03.svg"
}
}
}
onSupplyServerSettings: function(server, key_names, keys) {
gsp.serverName = server;
toolbar.setTitle(qsTr("server-settings"));
console.log("Servers: " + key_names);
for (let i=0; i<key_names.length;i++) {
console.log("FOUND SERVER KEY " + key_names[i] + " " + keys[i]);
}
}
}
}

2
qml/widgets/ProfileList.qml
View File

@ -115,6 +115,8 @@ ColumnLayout {
onClicked: function(handle) { profileAddEditPane.reset(); parentStack.pane = parentStack.addEditProfilePane }
}
}
}
}