From 1b4d3435adf31cb7efb7b3f1cd52a29b2343e220 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Wed, 29 Sep 2021 17:29:52 -0700
Subject: [PATCH] Remove Failing Peer Calls

---
 go.mod           | 6 +++++-
 go.sum           | 4 ++++
 lib.go           | 2 +-
 utils/manager.go | 2 --
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 8003a44..2c6c630 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	cwtch.im/cwtch v0.10.0
-	git.openprivacy.ca/openprivacy/connectivity v1.4.5
+	git.openprivacy.ca/openprivacy/connectivity v1.5.0
 	git.openprivacy.ca/openprivacy/log v1.0.3
 	golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect
 	golang.org/x/mod v0.5.0 // indirect
@@ -12,3 +12,7 @@ require (
 	golang.org/x/tools v0.1.5 // indirect
 )
 
+replace (
+	cwtch.im/cwtch => /home/sarah/workspace/src/cwtch.im/cwtch
+	git.openprivacy.ca/cwtch.im/tapir => /home/sarah/workspace/src/cwtch.im/tapir
+)
diff --git a/go.sum b/go.sum
index e1b7e5d..728bee5 100644
--- a/go.sum
+++ b/go.sum
@@ -3,6 +3,8 @@ cwtch.im/cwtch v0.9.2 h1:daDJPDWJ3uwRZ/UYPkmhpxxA/G8/FtFAQwbIGhM24ng=
 cwtch.im/cwtch v0.9.2/go.mod h1:EwUUVWIU4OAcz0HmHUxaY4orzKH6ZiNXaVI8y/5UP5k=
 cwtch.im/cwtch v0.10.0 h1:U24pxb5mwqQj5T/do+3IG3WgnM0y9/9FuizGo3crj70=
 cwtch.im/cwtch v0.10.0/go.mod h1:EwUUVWIU4OAcz0HmHUxaY4orzKH6ZiNXaVI8y/5UP5k=
+filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
+filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 git.openprivacy.ca/cwtch.im/tapir v0.3.4/go.mod h1:+Niy2AHhQC351ZTtfhC0uLjViCICyOxCJZsIlGKKNAU=
 git.openprivacy.ca/cwtch.im/tapir v0.4.4 h1:KyuTVmr9GYptTCeR7JDODjmhBBbnIBf9V3NSC4+6bHc=
 git.openprivacy.ca/cwtch.im/tapir v0.4.4/go.mod h1:qMFTdmDZITc1BLP1jSW0gVpLmvpg+Zjsh5ek8StwbFE=
@@ -19,6 +21,8 @@ git.openprivacy.ca/openprivacy/bine v0.0.4/go.mod h1:13ZqhKyqakDsN/ZkQkIGNULsmLy
 git.openprivacy.ca/openprivacy/connectivity v1.4.2/go.mod h1:bR0Myx9nm2YzWtsThRelkNMV4Pp7sPDa123O1qsAbVo=
 git.openprivacy.ca/openprivacy/connectivity v1.4.5 h1:UYMdCWPzEAP7LbqdMXGNXmfKjWlvfnKdmewBtnbgQRI=
 git.openprivacy.ca/openprivacy/connectivity v1.4.5/go.mod h1:JVRCIdL+lAG6ohBFWiKeC/MN42nnC0sfFszR9XG6vPQ=
+git.openprivacy.ca/openprivacy/connectivity v1.5.0 h1:ZxsR/ZaVKXIkD2x6FlajZn62ciNQjamrI4i/5xIpdoQ=
+git.openprivacy.ca/openprivacy/connectivity v1.5.0/go.mod h1:UjQiGBnWbotmBzIw59B8H6efwDadjkKzm3RPT1UaIRw=
 git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
 git.openprivacy.ca/openprivacy/log v1.0.2 h1:HLP4wsw4ljczFAelYnbObIs821z+jgMPCe8uODPnGQM=
 git.openprivacy.ca/openprivacy/log v1.0.2/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
diff --git a/lib.go b/lib.go
index f988274..3d4fc9d 100644
--- a/lib.go
+++ b/lib.go
@@ -87,7 +87,7 @@ func StartCwtch(appDir string, torPath string) int {
 	if runtime.GOOS == "android" {
 		log.SetUseColor(false)
 	}
-	log.SetLevel(log.LevelDebug)
+
 	if logLevel := os.Getenv("LOG_LEVEL"); strings.ToLower(logLevel) == "debug" {
 		log.SetLevel(log.LevelDebug)
 	}
diff --git a/utils/manager.go b/utils/manager.go
index d4168b5..0e5e5a8 100644
--- a/utils/manager.go
+++ b/utils/manager.go
@@ -110,8 +110,6 @@ func (p *PeerHelper) GetNick(id string) string {
 			nick, exists = p.peer.GetContactAttribute(id, attr.GetPeerScope(constants.Name))
 			if !exists {
 				nick = "[" + id + "]"
-				// re-request
-				p.peer.SendGetValToPeer(id, attr.PublicScope, constants.Name)
 			}
 		}
 		return nick