From 81906f08f62fc4964c64574c591d7a1495c1e67e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 23 Sep 2017 09:05:09 -0700 Subject: [PATCH] disconnect --- ODClient/odClient.go | 9 +++++++-- goRicochetMobile.go | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ODClient/odClient.go b/ODClient/odClient.go index 05cdec3..d30eb9c 100644 --- a/ODClient/odClient.go +++ b/ODClient/odClient.go @@ -70,8 +70,6 @@ func (odClient *ODClient) Connect(privateKeyData string, serverAddr string) erro log.Println("ODClient: Authenticated") - log.Println("go") - log.Println("RequestOpenChanel chat") err = odClient.connection.RequestOpenChannel("im.ricochet.chat", odClient) if err != nil { @@ -84,6 +82,13 @@ func (odClient *ODClient) Connect(privateKeyData string, serverAddr string) erro return nil } +func (odClient *ODClient) Disconnect() { + log.Println("Break()...") + odClient.connection.Break() + log.Println("Conn.Close()...") + odClient.connection.Conn.Close() +} + /*func (odClient *ODClient) RequestContact() { odClient.connection.Do(func() error { channel := odClient.connection.Channel("im.ricochet.contact.request", channels.Outbound) diff --git a/goRicochetMobile.go b/goRicochetMobile.go index 7266817..bfbbbe6 100644 --- a/goRicochetMobile.go +++ b/goRicochetMobile.go @@ -17,7 +17,7 @@ var ( // moddified levelArr = []int{1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6} - odClient *ODClient.ODClient + odClient *ODClient.ODClient = nil ) func GeneratePrivateKey() (string, error) { @@ -45,6 +45,12 @@ func ODClientConnect(privateKey string, serverAddr string) error { return err } +func ODClientDisconnect() { + log.Println("ODClientDisconnect()") + odClient.Disconnect() + odClient = nil +} + func GetDeviceName() string { odClient.SendMessage("/name") name := odClient.GetMessage()