From 8879b1f855dda88dc10daa702df69502ac0c0738 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 22 Feb 2019 08:44:19 -0800 Subject: [PATCH 1/4] updating windows instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ed46c2c..8ca56d8 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,4 @@ We supply an arm-pie version of tor in `android/libs/armeabi-v7a` with the name If all that is done, then check out cwtch.im/ui and run `qtdeploy` in the root of it. -Currently you will need to manually run tor first before running cwtch.im/ui \ No newline at end of file +Currently you will need to manually run tor first before running cwtch.im/ui. Use the included tor and torrc file: `tor -f torrc` From 9d9baa3fe2540396b81ac683000d0c366f078169 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 22 Feb 2019 13:49:59 -0800 Subject: [PATCH 2/4] drone: paths... --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f5ef61d..cc42ec2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,8 +10,10 @@ pipeline: - QT_DIR=/opt/Qt - QT_DOCKER='true' - QT_API=5.12.0 - - GOPATH=/home/user/work:/media/sf_GOPATH1/ commands: + - echo $QT_DIR + - export GOPATH=$GOPATH:/media/sf_GOPATH1/ + - echo $GOPATH - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - echo $PATH - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git From 6c57967d2f31deeac0bb1cb7ae0462f38974468a Mon Sep 17 00:00:00 2001 From: erinn Date: Fri, 22 Feb 2019 15:53:58 -0800 Subject: [PATCH 3/4] fix pastebox weirdness --- qml/widgets/MyProfile.qml | 57 +++++++++++---------------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml index b227e92..5b2b1dd 100644 --- a/qml/widgets/MyProfile.qml +++ b/qml/widgets/MyProfile.qml @@ -5,6 +5,9 @@ import QtQuick.Controls.Material 2.0 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 +import QtQuick.Controls 1.4 + +import "../styles" ColumnLayout { id: root @@ -200,49 +203,19 @@ ColumnLayout { } } - RowLayout { - anchors.left: parent.left - anchors.right: parent.right + TextField { + anchors.horizontalCenter: parent.horizontalCenter + style: CwtchTextFieldStyle{ width: 400 } + placeholderText: "... paste an address here to add a contact ..." + horizontalAlignment: TextInput.AlignHCenter - - Rectangle { // ADD CONTACTS TEXTFIELD - width: parent.width - 4 - height: 20 - color: "#EDEDED" - border.color: "#AAAAAA" - border.width: 1 - radius: 10 - anchors.horizontalCenter: parent.horizontalCenter - - - TextEdit { - property string hint: "... paste an address here to add a contact ..." - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: 9 - color: "#888888" - padding: 2 - text: hint - selectByMouse: true - - onTextChanged: { - if (text != hint && text != "") { - console.log("to handle: "+text) - gcd.importString(text) - text = hint - } - } - - onFocusChanged: { - text = focus ? "" : hint - } - - onCursorPositionChanged: { - text = focus ? "" : hint - } - } - } - } + onTextChanged: { + if (text != "") { + gcd.importString(text) + text = "" + } + } + } Connections { target: gcd From 644961d218e193e357cd970b750949a51740592d Mon Sep 17 00:00:00 2001 From: erinn Date: Fri, 22 Feb 2019 16:21:19 -0800 Subject: [PATCH 4/4] show contact name on new incoming group messages --- go/characters/incominglistener.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/go/characters/incominglistener.go b/go/characters/incominglistener.go index 266c5ea..a2c0aa5 100644 --- a/go/characters/incominglistener.go +++ b/go/characters/incominglistener.go @@ -40,6 +40,18 @@ func IncomingListener(callback func(*gobjects.Message), groupErrorCallback func( the.Peer.SendMessageToPeer(e.Data[event.RemotePeer], "ack") } case event.NewMessageFromGroup://event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer + var name string + var exists bool + ctc := the.Peer.GetContact(e.Data[event.RemotePeer]) + if ctc != nil { + name, exists = ctc.GetAttribute("nick") + if !exists || name == "" { + name = e.Data[event.RemotePeer] + "..." + } + } else { + name = e.Data[event.RemotePeer] + "..." + } + ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampSent]) callback(&gobjects.Message{ MessageID: e.Data[event.Signature], @@ -50,6 +62,7 @@ func IncomingListener(callback func(*gobjects.Message), groupErrorCallback func( FromMe: e.Data[event.RemotePeer] == the.Peer.GetProfile().Onion, Timestamp: ts, Acknowledged: true, + DisplayName: name, }) case event.NewGroupInvite: log.Debugf("got a group invite!")