multi servers part 3: switch servers menu action + some refactoring

ui/controller/controller.go

@@ -156,7 +156,7 @@ func (m *Controller) PromptForFirstServer() {
 					Username:    d.Username,
 					LegacyAuth:  d.LegacyAuth,
 				}
-				server := m.App.Config.AddServer(d.Nickname, conn)
+				server := m.App.ServerManager.AddServer(d.Nickname, conn)
 				if err := m.trySetPasswordAndConnectToServer(server, d.Password); err != nil {
 					log.Printf("error connecting to server: %s", err.Error())
 				}
@@ -332,7 +332,7 @@ func (m *Controller) PromptForLoginAndConnect() {
 						Username:    newD.Username,
 						LegacyAuth:  newD.LegacyAuth,
 					}
-					server := m.App.Config.AddServer(newD.Nickname, conn)
+					server := m.App.ServerManager.AddServer(newD.Nickname, conn)
 					m.trySetPasswordAndConnectToServer(server, newD.Password)
 					m.doModalClosed()
 				}
@@ -351,7 +351,7 @@ func (m *Controller) PromptForLoginAndConnect() {
 			fmt.Sprintf("Are you sure you want to delete the server %q?", server.Nickname),
 			func(ok bool) {
 				if ok {
-					m.App.Config.DeleteServer(server.ID)
+					m.App.ServerManager.DeleteServer(server.ID)
 					m.App.DeleteServerCacheDir(server.ID)
 					d.SetServers(m.App.Config.Servers)
 				}

ui/dialogs/logindialog.go

@@ -39,27 +39,26 @@ func NewLoginDialog(servers []*backend.ServerConfig, pwFetch PasswordFetchFunc)
 	l.ExtendBaseWidget(l)
 	titleLabel := widget.NewLabel("Login to Server")
 	titleLabel.TextStyle.Bold = true
+	l.passField = widget.NewPasswordEntry()
+	l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
+
 	serverNames := sharedutil.MapSlice(servers, func(s *backend.ServerConfig) string { return s.Nickname })
 	l.serverSelect = widget.NewSelect(serverNames, func(_ string) {
-		if l.passField == nil {
-			return
-		}
 		if pwFetch != nil {
 			if pw, err := pwFetch(servers[l.serverSelect.SelectedIndex()].ID); err == nil {
 				l.passField.SetText(pw)
 				return
 			}
 		}
+		l.passField.SetText("")
 	})
 	l.serverSelect.SetSelectedIndex(0)
+
 	editBtn := widget.NewButtonWithIcon("", theme.DocumentCreateIcon(), l.onEditServer)
 	newBtn := widget.NewButtonWithIcon("", theme.ContentAddIcon(), l.onNewServer)
 	deleteBtn := widget.NewButtonWithIcon("", theme.DeleteIcon(), func() { l.onDeleteServer(l.serverSelect.SelectedIndex()) })
-	l.passField = widget.NewPasswordEntry()
-	l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
 	l.submitBtn = widget.NewButton("OK", l.onSubmit)
 	l.submitBtn.Importance = widget.HighImportance
-
 	l.promptText = widget.NewRichTextWithText("")
 	l.promptText.Segments[0].(*widget.TextSegment).Style.ColorName = theme.ColorNameError
 	l.promptText.Hidden = true

ui/mainwindow.go

@@ -113,7 +113,8 @@ func NewMainWindow(fyneApp fyne.App, appName, appVersion string, app *backend.Ap
 		m.BrowsingPane.ClearHistory()
 		m.Controller.PromptForLoginAndConnect()
 	})
-	m.BrowsingPane.AddSettingsMenuItem("Log Out", app.ServerManager.Logout)
+	m.BrowsingPane.AddSettingsMenuItem("Log Out", func() { app.ServerManager.Logout(true) })
+	m.BrowsingPane.AddSettingsMenuItem("Switch Servers", func() { app.ServerManager.Logout(false) })
 	m.BrowsingPane.AddSettingsMenuItem("Check for Updates", func() {
 		go func() {
 			if t := app.UpdateChecker.CheckLatestVersionTag(); t != "" && t != app.VersionTag() {