Tapir Integtation #325

Merged
dan merged 2 commits from tapir-server into master 2020-10-02 19:58:53 +00:00
Owner

DO NOT MERGE - needs Cwtch changes to be merged first! Illustrative purposes only

DO NOT MERGE - needs Cwtch changes to be merged first! Illustrative purposes only
Member

Drone Build Status: failure

https://build.openprivacy.ca/cwtch.im/ui/638

Drone Build Status: failure https://build.openprivacy.ca/cwtch.im/ui/638
Member

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/643

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/643
sarah changed title from WIP: Tapir Integtation to Tapir Integtation 2020-09-28 22:45:21 +00:00
Member

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/645

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/645
dan requested changes 2020-09-28 23:07:37 +00:00
@ -429,6 +461,29 @@ func (this *GrandCentralDispatcher) importString(str string) {
return
}
if strings.HasPrefix(str, "tofubundle:") {

these prefixes should be consts somewhere "tofobundle" and "server"

these prefixes should be consts somewhere "tofobundle" and "server"
@ -430,2 +462,4 @@
}
if strings.HasPrefix(str, "tofubundle:") {
bundle := strings.Split(str,"||")

ideally both the bundle and sever invite parsers are functions in a file that also has the functions to compose the strings from the inputs as well, for easy comparison and ruse elsewhere

ideally both the bundle and sever invite parsers are functions in a file that also has the functions to compose the strings from the inputs as well, for easy comparison and ruse elsewhere
go/ui/gcd.go Outdated
@ -432,0 +468,4 @@
if err == nil {
err := the.Peer.AddServer(string(bundle))
if err == nil {
this.InvokePopup("Successfully Imported Server Key Bundle")

I think marcia called out recently she wanted to move away from the ephemeral popup errors and place error text in the editfield in red till new typing occurs.

but we can also catch that in a later pass if its a pain to add now

I think marcia called out recently she wanted to move away from the ephemeral popup errors and place error text in the editfield in red till new typing occurs. but we can also catch that in a later pass if its a pain to add now
@ -131,3 +180,3 @@
txtServer.text = server
txtInvitation.text = invite
cbInvite.model = addrbooknames.map(function(e){return Utils.htmlEscaped(e)})
//cbInvite.model = addrbooknames.map(function(e){return Utils.htmlEscaped(e)})

needed? or delete?

needed? or delete?
Member

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/647

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/647
dan merged commit 9e784ba4ea into master 2020-10-02 19:58:53 +00:00
This repo is archived. You cannot comment on pull requests.
No description provided.