From 406b3510b8a5309e46c76503ab1b08ce983ab21e Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 26 May 2021 15:21:01 -0700 Subject: [PATCH 1/3] IndexedError + Default Theme to Dark --- go.mod | 4 ++++ lib.go | 1 + utils/eventHandler.go | 1 + utils/settings.go | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f697b08..4f5d88e 100644 --- a/go.mod +++ b/go.mod @@ -8,3 +8,7 @@ require ( git.openprivacy.ca/openprivacy/log v1.0.2 golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect ) + +replace ( + cwtch.im/cwtch => /home/sarah/workspace/src/cwtch.im/cwtch +) \ No newline at end of file diff --git a/lib.go b/lib.go index c01444a..cca06f9 100644 --- a/lib.go +++ b/lib.go @@ -105,6 +105,7 @@ func StartCwtch(appDir string, torPath string) { event.NewMessageFromPeer, event.PeerAcknowledgement, event.PeerError, + event.SendMessageToPeerError, event.SendMessageToGroupError, event.NewGetValMessageFromPeer, event.PeerStateChange, diff --git a/utils/eventHandler.go b/utils/eventHandler.go index 99881f5..284545f 100644 --- a/utils/eventHandler.go +++ b/utils/eventHandler.go @@ -351,6 +351,7 @@ func (eh *EventHandler) startHandlingPeer(onion string) { eventBus.Subscribe(event.NewMessageFromPeer, q) eventBus.Subscribe(event.PeerAcknowledgement, q) eventBus.Subscribe(event.IndexedAcknowledgement, q) + eventBus.Subscribe(event.IndexedFailure, q) eventBus.Subscribe(event.NewMessageFromGroup, q) eventBus.Subscribe(event.NewGroup, q) eventBus.Subscribe(event.AcceptGroupInvite, q) diff --git a/utils/settings.go b/utils/settings.go index 719404d..b068571 100644 --- a/utils/settings.go +++ b/utils/settings.go @@ -33,7 +33,7 @@ type GlobalSettings struct { var DefaultGlobalSettings = GlobalSettings{ Locale: "en", - Theme: "light", + Theme: "dark", PreviousPid: -1, ExperimentsEnabled: false, Experiments: make(map[string]bool), From 30490f7b9df3ef6529f5c1787bf5494c9a282433 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 26 May 2021 15:46:24 -0700 Subject: [PATCH 2/3] Upgrade Cwtch --- go.mod | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 4f5d88e..80d070b 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,8 @@ module git.openprivacy.ca/flutter/libcwtch-go go 1.15 require ( - cwtch.im/cwtch v0.8.1 + cwtch.im/cwtch v0.8.2 git.openprivacy.ca/openprivacy/connectivity v1.4.3 git.openprivacy.ca/openprivacy/log v1.0.2 golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect -) - -replace ( - cwtch.im/cwtch => /home/sarah/workspace/src/cwtch.im/cwtch ) \ No newline at end of file From b4681241bc328c40a175f390c63af8c5f4d7fea7 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 26 May 2021 15:48:01 -0700 Subject: [PATCH 3/3] go.sum --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index 07b8f62..29dc8cb 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ cwtch.im/cwtch v0.8.0 h1:QDRaDBTXefFRPZPqUMtxoNhOcgXv0rl0bGjysSOmJX0= cwtch.im/cwtch v0.8.0/go.mod h1:+SY/4ueF1U7mK+CX8hZFbtd+GC1lx/cReo110KgtQAw= cwtch.im/cwtch v0.8.1 h1:5wsbPfc75nyKW527ABSO/ww8k7heSkpe49hfcBEEzSA= cwtch.im/cwtch v0.8.1/go.mod h1:+SY/4ueF1U7mK+CX8hZFbtd+GC1lx/cReo110KgtQAw= +cwtch.im/cwtch v0.8.2 h1:cn5utoZ7Od4iXiTthDn92XjXzXUEbcQGejCqrclI5yY= +cwtch.im/cwtch v0.8.2/go.mod h1:+SY/4ueF1U7mK+CX8hZFbtd+GC1lx/cReo110KgtQAw= cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw= cwtch.im/tapir v0.2.1/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ= git.openprivacy.ca/cwtch.im/tapir v0.3.2 h1:thLWqqY1LkirWFcy9Tg6NgWeYbvo9xBm+s2XVnCIvpY=