From bf15c3977c27536e47578e8b0ecaedb852c5ff52 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 24 Jan 2018 11:25:46 +0100
Subject: Fixed initial account login.

Because we ended up trying to load the resources before they even
existed (directly after the account was created), we ended up creating a
second set of unconfigured resources.
Storing the password by modifying the resource was an artifact of the
past anyways, and a login function results in a cleaner system and fixes
the problem at hand.
---
 accounts/imap/imapsettings.cpp | 1 -
 accounts/imap/qml/Login.qml    | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'accounts/imap')

diff --git a/accounts/imap/imapsettings.cpp b/accounts/imap/imapsettings.cpp
index a9749878..1f338e83 100644
--- a/accounts/imap/imapsettings.cpp
+++ b/accounts/imap/imapsettings.cpp
@@ -33,7 +33,6 @@ void ImapSettings::load()
 
 void ImapSettings::save()
 {
-    mSmtpPassword = mImapPassword;
     saveAccount();
     saveImapResource();
     saveMailtransportResource();
diff --git a/accounts/imap/qml/Login.qml b/accounts/imap/qml/Login.qml
index 14e13e89..c9304b0e 100644
--- a/accounts/imap/qml/Login.qml
+++ b/accounts/imap/qml/Login.qml
@@ -33,7 +33,7 @@ Item {
     }
 
     function login(){
-        settings.save()
+        settings.login({accountSecret: pwField.text})
     }
 
     GridLayout {
@@ -53,10 +53,7 @@ Item {
             id: pwField
             Layout.fillWidth: true
             focus: true
-
             placeholderText: qsTr("Password of your IMAP account")
-            text: settings.imapPassword
-            onTextChanged: settings.imapPassword = text
         }
     }
 }
-- 
cgit v1.2.3