mal
/
libcwtch-go
forked from cwtch.im/libcwtch-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add started() is lcg initialized check api; prevcent reconnect from launching dup peer message forwarding; remove unused MessageCounterResync

This commit is contained in:
Dan Ballard 2022-03-10 14:09:52 -08:00
parent 4b881b9a12
commit 7ace298d6e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib.go
View File

@ -8,14 +8,12 @@ import "C"
import ( import (
"crypto/rand" "crypto/rand"
constants2 "cwtch.im/cwtch/model/constants"
"cwtch.im/cwtch/protocol/files" "cwtch.im/cwtch/protocol/files"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
path "path/filepath" path "path/filepath"
"strconv"
constants2 "cwtch.im/cwtch/model/constants"
"git.openprivacy.ca/cwtch.im/libcwtch-go/features" "git.openprivacy.ca/cwtch.im/libcwtch-go/features"
@ -294,6 +292,19 @@ func buildACN(settings utils.GlobalSettings, torPath string, appDir string) conn
return acn return acn
} }
//export c_Started
func c_Started() C.int {
return C.int(Started())
}
// Started returns 1 if application is initialized and 0 if it is null
func Started() int {
if application == nil {
return 0
}
return 1
}
//export c_ReconnectCwtchForeground //export c_ReconnectCwtchForeground
func c_ReconnectCwtchForeground() { func c_ReconnectCwtchForeground() {
ReconnectCwtchForeground() ReconnectCwtchForeground()
@ -302,7 +313,7 @@ func c_ReconnectCwtchForeground() {
// Like StartCwtch, but StartCwtch has already been called so we don't need to restart Tor etc (probably) // Like StartCwtch, but StartCwtch has already been called so we don't need to restart Tor etc (probably)
// Do need to re-send initial state tho, eg profiles that are already loaded // Do need to re-send initial state tho, eg profiles that are already loaded
func ReconnectCwtchForeground() { func ReconnectCwtchForeground() {
log.Infof("Reconnecting cwtchforeground") log.Infof("Reconnecting cwtch foreground")
if application == nil { if application == nil {
log.Errorf("ReconnectCwtchForeground: Application is nil, presuming stale thread, EXITING Reconnect\n") log.Errorf("ReconnectCwtchForeground: Application is nil, presuming stale thread, EXITING Reconnect\n")
return return
@ -311,7 +322,7 @@ func ReconnectCwtchForeground() {
// populate profile list // populate profile list
peerList := application.ListProfiles() peerList := application.ListProfiles()
for _, onion := range peerList { for _, onion := range peerList {
eventHandler.Push(event.NewEvent(event.NewPeer, map[event.Field]string{event.Identity: onion})) eventHandler.Push(event.NewEvent(event.NewPeer, map[event.Field]string{event.Identity: onion, "Reload": event.True}))
} }
settings := utils.ReadGlobalSettings() settings := utils.ReadGlobalSettings()
@ -319,17 +330,6 @@ func ReconnectCwtchForeground() {
for _, profileOnion := range peerList { for _, profileOnion := range peerList {
// fix peerpeercontact message counts // fix peerpeercontact message counts
profile := application.GetPeer(profileOnion) profile := application.GetPeer(profileOnion)
conversations, _ := profile.FetchConversations()
for _, conversation := range conversations {
if (conversation.IsGroup() && groupHandler != nil) || !conversation.IsServer() {
totalMessages, _ := profile.GetChannelMessageCount(conversation.ID, 0)
eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{
event.Identity: profileOnion,
event.ConversationID: strconv.Itoa(conversation.ID),
event.Data: strconv.Itoa(totalMessages),
}))
}
}
// Group Experiment Server Refresh // Group Experiment Server Refresh
if groupHandler != nil { if groupHandler != nil {