diff --git a/go.mod b/go.mod index e6625d2..0b4c97e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cwtch.im/cwtch v0.20.6 git.openprivacy.ca/cwtch.im/server v1.4.5 - git.openprivacy.ca/openprivacy/connectivity v1.9.0 + git.openprivacy.ca/openprivacy/connectivity v1.10.0 git.openprivacy.ca/openprivacy/log v1.0.3 github.com/mutecomm/go-sqlcipher/v4 v4.4.2 ) @@ -19,9 +19,10 @@ require ( github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect go.etcd.io/bbolt v1.3.6 // indirect golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d // indirect - golang.org/x/mobile v0.0.0-20230427221453-e8d11dd0ba41 // indirect + golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect golang.org/x/tools v0.1.12 // indirect + ) diff --git a/go.sum b/go.sum index d88757f..e7beb87 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ git.openprivacy.ca/openprivacy/bine v0.0.4/go.mod h1:13ZqhKyqakDsN/ZkQkIGNULsmLy git.openprivacy.ca/openprivacy/bine v0.0.5 h1:DJs5gqw3SkvLSgRDvroqJxZ7F+YsbxbBRg5t0rU5gYE= git.openprivacy.ca/openprivacy/bine v0.0.5/go.mod h1:fwdeq6RO08WDkV0k7HfArsjRvurVULoUQmT//iaABZM= git.openprivacy.ca/openprivacy/connectivity v1.8.6/go.mod h1:Hn1gpOx/bRZp5wvCtPQVJPXrfeUH0EGiG/Aoa0vjGLg= -git.openprivacy.ca/openprivacy/connectivity v1.9.0 h1:vaQ9pI0q1Qi2QMvf59x+3bzk0Eb0qU4Z9j0Cpxf0/SI= -git.openprivacy.ca/openprivacy/connectivity v1.9.0/go.mod h1:OQO1+7OIz/jLxDrorEMzvZA6SEbpbDyLGpjoFqT3z1Y= +git.openprivacy.ca/openprivacy/connectivity v1.10.0 h1:7P5xdFL4mGg9bwlIY+sdaNGUMazlMB82/v/6kXlvqxY= +git.openprivacy.ca/openprivacy/connectivity v1.10.0/go.mod h1:OQO1+7OIz/jLxDrorEMzvZA6SEbpbDyLGpjoFqT3z1Y= git.openprivacy.ca/openprivacy/log v1.0.3 h1:E/PMm4LY+Q9s3aDpfySfEDq/vYQontlvNj/scrPaga0= git.openprivacy.ca/openprivacy/log v1.0.3/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -92,8 +92,8 @@ golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d h1:3qF+Z8Hkrw9sOhrFHti9TlB1Hkac1x+DNRkv0XQiFjo= golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/mobile v0.0.0-20230427221453-e8d11dd0ba41 h1:539vykMVJsmdiucRtMmdeLLZaTVhWhaAHFcPabj2lws= -golang.org/x/mobile v0.0.0-20230427221453-e8d11dd0ba41/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= +golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda h1:O+EUvnBNPwI4eLthn8W5K+cS8zQZfgTABPLNm6Bna34= +golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= diff --git a/templates/lib_template.go b/templates/lib_template.go index 5cf126d..28ab26b 100644 --- a/templates/lib_template.go +++ b/templates/lib_template.go @@ -453,7 +453,8 @@ func buildACN(globalSettings settings.GlobalSettings, torPath string, appDir str if err != nil { log.Errorf("error creating tor data directory: %v. Aborting app start up", err) eventHandler.Push(event.NewEventList(CwtchStartError, event.Error, fmt.Sprintf("Error connecting to Tor: %v", err))) - return &connectivity.ErrorACN{}, globalSettings, err + erracn := connectivity.NewErrorACN(err) + return &erracn, globalSettings, err } if globalSettings.AllowAdvancedTorConfig { @@ -488,7 +489,8 @@ func buildACN(globalSettings settings.GlobalSettings, torPath string, appDir str if err != nil { log.Errorf("error constructing torrc: %v", err) eventHandler.Push(event.NewEventList(CwtchStartError, event.Error, fmt.Sprintf("Error connecting to Tor: %v", err))) - return &connectivity.ErrorACN{}, globalSettings, err + erracn := connectivity.NewErrorACN(err) + return &erracn, globalSettings, err } dataDir := globalSettings.TorCacheDir @@ -508,7 +510,8 @@ func buildACN(globalSettings settings.GlobalSettings, torPath string, appDir str if dataDir, err = os.MkdirTemp(torDir, "data-dir-"); err != nil { eventHandler.Push(event.NewEventList(CwtchStartError, event.Error, fmt.Sprintf("Error connecting to Tor: %v", err))) - return &connectivity.ErrorACN{}, globalSettings, err + erracn := connectivity.NewErrorACN(err) + return &erracn, globalSettings, err } } @@ -519,7 +522,8 @@ func buildACN(globalSettings settings.GlobalSettings, torPath string, appDir str if err != nil { log.Errorf("Error connecting to Tor replacing with ErrorACN: %v\n", err) eventHandler.Push(event.NewEventList(CwtchStartError, event.Error, fmt.Sprintf("Error connecting to Tor: %v", err))) - acn = &connectivity.ErrorACN{} + erracn := connectivity.NewErrorACN(err) + acn = &erracn } return acn, globalSettings, err }