From bce30e32a049b3ee76081c8d3881a3820b0e7341 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 20 Mar 2020 15:57:55 +0200 Subject: Update mautrix-go to ignore 404 errors in .well-known resolution --- go.mod | 2 +- go.sum | 2 ++ ui/view-login.go | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index dfeb7ad..f72db5c 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( golang.org/x/net v0.0.0-20200301022130-244492dfa37a gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 gopkg.in/yaml.v2 v2.2.8 - maunium.net/go/mautrix v0.1.0-beta.1.0.20200320123139-8ba1d97ed86b + maunium.net/go/mautrix v0.1.0-beta.1.0.20200320135656-32dd5f172592 maunium.net/go/mauview v0.1.0-beta.1 maunium.net/go/tcell v0.1.0 ) diff --git a/go.sum b/go.sum index 8076ac6..1537220 100644 --- a/go.sum +++ b/go.sum @@ -75,6 +75,8 @@ maunium.net/go/mautrix v0.1.0-beta.1.0.20200320113420-8101f052c782 h1:gLsc8FRp9m maunium.net/go/mautrix v0.1.0-beta.1.0.20200320113420-8101f052c782/go.mod h1:YFMU9DBeXH7cqx7sJLg0DkVxwNPbih8QbpUTYf/IjMM= maunium.net/go/mautrix v0.1.0-beta.1.0.20200320123139-8ba1d97ed86b h1:sQ7w1dOTvTg76wLCUyb30+jEsVIVvI4Zw4IOPdwogIE= maunium.net/go/mautrix v0.1.0-beta.1.0.20200320123139-8ba1d97ed86b/go.mod h1:YFMU9DBeXH7cqx7sJLg0DkVxwNPbih8QbpUTYf/IjMM= +maunium.net/go/mautrix v0.1.0-beta.1.0.20200320135656-32dd5f172592 h1:WybA4BBUyod/qN6/yChfh2Q0CAqoZjtWnpUBwmfbfFU= +maunium.net/go/mautrix v0.1.0-beta.1.0.20200320135656-32dd5f172592/go.mod h1:YFMU9DBeXH7cqx7sJLg0DkVxwNPbih8QbpUTYf/IjMM= maunium.net/go/mauview v0.1.0-beta.1 h1:hRprD6NTi5Mw7i97DKmgs/TzFQeNpGPytPoswNlU/Ww= maunium.net/go/mauview v0.1.0-beta.1/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U= maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM= diff --git a/ui/view-login.go b/ui/view-login.go index b26fb3a..9eb8226 100644 --- a/ui/view-login.go +++ b/ui/view-login.go @@ -112,10 +112,10 @@ func (view *LoginView) resolveWellKnown() { if err != nil { view.homeserver.SetText("") view.Error(err.Error()) - return + } else if resp != nil { + view.homeserver.SetText(resp.Homeserver.BaseURL) + view.parent.Render() } - view.homeserver.SetText(resp.Homeserver.BaseURL) - view.parent.Render() } func (view *LoginView) focusChanged(from, to mauview.Component) { -- cgit v1.2.3