cwtch.im
/
autobindings
4
0
Fork 0
Code Issues 1 Pull Requests Releases 14 Activity

Update connectivity. Delay tor connection until the end of setup #29

Merged
sarah merged 7 commits from tor-setup into main 2023-06-13 18:43:49 +00:00
Conversation 5 Commits 7 Files Changed 3 +63 -36
sarah commented 2023-05-24 19:28:12 +00:00
Owner
Copy Link
No description provided.
dan was assigned by sarah 2023-05-24 19:28:12 +00:00
sarah added 1 commit 2023-05-24 19:28:13 +00:00
buildbot commented 2023-05-24 19:33:59 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/autobindings/94

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/autobindings/94
dan reviewed 2023-05-24 20:38:33 +00:00
templates/lib_template.go Outdated
@ -171,1 +169,3 @@
settingsFile.WriteGlobalSettings(globalSettings)
// start with an Error ACN
globalACN = connectivity.NewProxyACN(&connectivity.ErrorACN{})
// settingsFile.WriteGlobalSettings(globalSettings)
dan commented 2023-05-24 20:34:48 +00:00
Owner
Copy Link

delete?

delete?
dan marked this conversation as resolved
templates/lib_template.go Outdated
@ -198,0 +197,4 @@
// NOTE: This can block until finishing, so we wrap it in a
// go routine...
go func() {
newACN, globalSettings := buildACN(application.ReadSettings(), globalTorPath, globalAppDir)
dan commented 2023-05-24 20:37:13 +00:00
Owner
Copy Link

we've already loaded settings above and this is operating in a seperate thread. i guess the globalSettings will be shaddowed but then the SettingsFile.WriteGlobalSettings(globalSettings) seems like a bad choice, this isnt the authoritative thread? also what would cause the settings to change here in this much smaller scope? should buildACN no longer return settings since I think that was just historical necesity but then we moved settings into app anyways?

we've already loaded settings above and this is operating in a seperate thread. i guess the `globalSettings` will be shaddowed but then the `SettingsFile.WriteGlobalSettings(globalSettings)` seems like a bad choice, this isnt the authoritative thread? also what would cause the settings to change here in this much smaller scope? should buildACN no longer return settings since I think that was just historical necesity but then we moved settings into app anyways?
dan marked this conversation as resolved
templates/lib_template.go Outdated
@ -198,0 +201,4 @@
settingsFile.WriteGlobalSettings(globalSettings)
globalACN.ReplaceACN(newACN)
application.QueryACNVersion()
// Settings may have changed...
dan commented 2023-05-24 20:38:07 +00:00
Owner
Copy Link

also application.QueryACNStatus() probably

also `application.QueryACNStatus()` probably
dan marked this conversation as resolved
sarah added 1 commit 2023-05-24 21:05:59 +00:00
continuous-integration/drone/pr Build is pending Details
6f427d282b Much nicer Tor Handling
sarah added 1 commit 2023-05-24 21:06:24 +00:00
continuous-integration/drone/pr Build is pending Details
2b67e4b9b3 Remove commented out code
dan reviewed 2023-05-25 02:08:10 +00:00
templates/lib_template.go
@ -411,0 +417,4 @@
currentSettings.CustomTorrc = settings.CustomTorrc
application.UpdateSettings(currentSettings)
globalACN.ReplaceACN(newAcn)
application.QueryACNVersion()
dan commented 2023-05-25 02:08:10 +00:00
Owner
Copy Link
		`application.QueryACNStatus()` as well
`application.QueryACNStatus()` as well
dan commented 2023-06-12 22:43:07 +00:00
Owner
Copy Link

pretty sure we still need application.QueryACNStatus() as well I think?

pretty sure we still need `application.QueryACNStatus()` as well I think?
dan marked this conversation as resolved
dan reviewed 2023-05-25 02:09:43 +00:00
templates/lib_template.go Outdated
@ -411,0 +423,4 @@
settings = application.ReadSettings()
settingsJson, _ := json.Marshal(settings)
application.GetPrimaryBus().Publish(event.NewEvent(UpdateGlobalSettings, map[event.Field]string{event.Data: string(settingsJson)}))
}
dan commented 2023-05-25 02:09:43 +00:00
Owner
Copy Link

Can we handle error? can ErrorACN have an alt constructor that takes an error string, so we can create a new one with the error, swap it in, and update status, so user can try hitting reset ACN again possibly?

Can we handle error? can ErrorACN have an alt constructor that takes an error string, so we can create a new one with the error, swap it in, and update status, so user can try hitting reset ACN again possibly?
sarah added 1 commit 2023-06-12 17:17:30 +00:00
continuous-integration/drone/pr Build is running Details
a18d9f0d17 Propagate update to ErrorACN
buildbot commented 2023-06-12 17:23:27 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/autobindings/97

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/autobindings/97
sarah added 1 commit 2023-06-12 17:25:31 +00:00
continuous-integration/drone/pr Build is running Details
6165b03b75 Initializing ErrorACN with an error
buildbot commented 2023-06-12 17:31:08 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/autobindings/98

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/autobindings/98
dan reviewed 2023-06-12 22:45:12 +00:00
templates/lib_template.go Outdated
@ -411,0 +424,4 @@
settings = application.ReadSettings()
settingsJson, _ := json.Marshal(settings)
application.GetPrimaryBus().Publish(event.NewEvent(UpdateGlobalSettings, map[event.Field]string{event.Data: string(settingsJson)}))
}
dan commented 2023-06-12 22:45:12 +00:00
Owner
Copy Link
else {

	globalACN.ReplaceACN(NewErrorACN(err)
    application.QueryACNStatus()
}```

to propegate real tor error to ui
``` else { globalACN.ReplaceACN(NewErrorACN(err) application.QueryACNStatus() }``` to propegate real tor error to ui
sarah added 1 commit 2023-06-13 17:06:10 +00:00
continuous-integration/drone/pr Build is running Details
4713f25755 propagate ACN status
buildbot commented 2023-06-13 17:11:44 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/autobindings/99

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/autobindings/99
sarah added 1 commit 2023-06-13 17:50:31 +00:00
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
1efc334258 Update Cwtch to 0.20.8
buildbot commented 2023-06-13 17:56:07 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/autobindings/101

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/autobindings/101
dan approved these changes 2023-06-13 18:28:32 +00:00
sarah merged commit 1efc334258 into main 2023-06-13 18:43:49 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
dan
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
infra

   
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
infra
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
dan
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: cwtch.im/autobindings#29
No description provided.
Delete Branch "tor-setup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?