Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 15:46:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1325: Add "already logged in" notification

Browse Source
This commit is contained in:
Alexander Bilyak
2021-11-22 23:27:16 +00:00
committed by Jakub
parent 961742fa53
commit 4a2ac813d3
6 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/frontend/qt/frontend_users.go
View File

@ -15,6 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
//go:build build_qt
// +build build_qt
package qt
@ -145,6 +146,7 @@ func (f *FrontendQt) finishLogin() {
defer f.eventListener.Remove(events.UserChangeDone, done)
user, err := f.bridge.FinishLogin(f.authClient, f.auth, f.password)
if err != nil && err != users.ErrUserAlreadyConnected {
f.log.WithError(err).Errorf("Finish login failed")
f.qml.Login2PasswordErrorAbort(err.Error())
@ -158,8 +160,12 @@ func (f *FrontendQt) finishLogin() {
index := f.qml.Users().indexByID(user.ID())
f.log.WithField("index", index).Debug("Login finished")
defer f.qml.LoginFinished(index)
if err == users.ErrUserAlreadyConnected {
f.log.WithError(err).Error("User already logged in")
f.qml.LoginAlreadyLoggedIn(index)
}
}
func (f *FrontendQt) waitForUserChangeDone(done <-chan string, userID string) {