aboutsummaryrefslogtreecommitdiff
path: root/ui/view-login.go
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2018-04-23 12:55:38 +0300
committerTulir Asokan <tulir@maunium.net>2018-04-23 12:55:38 +0300
commit9308f4cb47fa7ce2392185ca904ff7b1d11fe1bc (patch)
tree8de2ca443e66303bb82762eb15063726e87e0234 /ui/view-login.go
parentee4b0be953bb1e099bd8706a0f8e49fc18f41b6a (diff)
Show errors in login view. Fixes #14
Diffstat (limited to 'ui/view-login.go')
-rw-r--r--ui/view-login.go29
1 files changed, 26 insertions, 3 deletions
diff --git a/ui/view-login.go b/ui/view-login.go
index 46e1903..a900870 100644
--- a/ui/view-login.go
+++ b/ui/view-login.go
@@ -17,6 +17,7 @@
package ui
import (
+ "maunium.net/go/gomatrix"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/interface"
@@ -30,6 +31,7 @@ type LoginView struct {
homeserver *widget.AdvancedInputField
username *widget.AdvancedInputField
password *widget.AdvancedInputField
+ error *widget.FormTextView
matrix ifc.MatrixContainer
config *config.Config
@@ -65,7 +67,15 @@ func (ui *GomuksUI) NewLoginView() tview.Primitive {
ui.loginView = view
- return widget.Center(45, 11, ui.loginView)
+ return widget.Center(45, 13, ui.loginView)
+}
+
+func (view *LoginView) Error(err string) {
+ if view.error == nil {
+ view.error = &widget.FormTextView{TextView: tview.NewTextView()}
+ view.AddFormItem(view.error)
+ }
+ view.error.SetText(err)
}
func (view *LoginView) Login() {
@@ -75,6 +85,19 @@ func (view *LoginView) Login() {
debug.Printf("Logging into %s as %s...", hs, mxid)
view.config.HS = hs
- debug.Print("Connect result:", view.matrix.InitClient())
- debug.Print("Login result:", view.matrix.Login(mxid, password))
+ err := view.matrix.InitClient()
+ debug.Print("Init error:", err)
+ err = view.matrix.Login(mxid, password)
+ if err != nil {
+ if httpErr, ok := err.(gomatrix.HTTPError); ok {
+ if respErr, ok := httpErr.WrappedError.(gomatrix.RespError); ok {
+ view.Error(respErr.Err)
+ } else {
+ view.Error(httpErr.Message)
+ }
+ } else {
+ view.Error("Failed to connect to server.")
+ }
+ debug.Print("Login error:", err)
+ }
}