Merge lp:~rmescandon/telegram-app/reconnect-on-demand into lp:~libqtelegram-team/telegram-app/qml-plugin

[Roberto Mier Escandon]

Created two new methods for telegramClient object, to be used from qml:

telegramClient.sleep()
telegramClient.wake()

that can be used when application goes to background and comes back to foreground. Sleep invalidates library (closing network connections) instance and closes database connection. Wake method restarts library.

[Michał Karnicki (karni)]

in-line comments. +1, but feel free to grab me for comments after fix.

review: Approve

[lp:~rmescandon/telegram-app/reconnect-on-demand]

195. By Roberto Mier Escandon on 2014-08-20

CHANGED wake and sleep method names by init and shutdown

=== modified file 'qmlplugin/dbmanager.cpp'
--- qmlplugin/dbmanager.cpp	2014-08-18 18:49:11 +0000
+++ qmlplugin/dbmanager.cpp	2014-08-20 08:22:47 +0000
@@ -28,9 +28,7 @@
 }
 
 DbManager::~DbManager() {
-    if (m_database.isOpen()) {
-        m_database.close();
-    }
+    closeDatabase();
 }
 
 DbManager *DbManager::instance() {
@@ -38,6 +36,12 @@
     return self;
 }
 
+void DbManager::closeDatabase() {
+    if (m_database.isOpen()) {
+        m_database.close();
+    }
+}
+
 bool DbManager::initializeDatabase() {
 
     QDir dir(Config::instance()->databasePath());
@@ -47,7 +51,13 @@
     }
 
     m_databasePath = dir.absoluteFilePath(DATABASE_NAME);
-    m_database = QSqlDatabase::addDatabase("QSQLITE");
+
+    // if database doesn't contain a default connection, add it.
+    // This should avoid destroying and creating again the default connection
+    // if existing yet.
+    if (!m_database.contains()) {
+        m_database = QSqlDatabase::addDatabase("QSQLITE");
+    }
     m_database.setDatabaseName(m_databasePath);
 
     if (!createOrUpdateDatabase()) {

=== modified file 'qmlplugin/dbmanager.h'
--- qmlplugin/dbmanager.h	2014-08-18 18:49:11 +0000
+++ qmlplugin/dbmanager.h	2014-08-20 08:22:47 +0000
@@ -30,6 +30,7 @@
     static DbManager *instance();
 
     bool initializeDatabase();
+    void closeDatabase();
     QSqlDatabase database() const;
 
     bool beginTransaction();

=== modified file 'qmlplugin/telegramclient.cpp'
--- qmlplugin/telegramclient.cpp	2014-08-19 10:07:39 +0000
+++ qmlplugin/telegramclient.cpp	2014-08-20 08:22:47 +0000
@@ -32,7 +32,7 @@
 TelegramClient::~TelegramClient() {
 }
 
-void TelegramClient::initTelegramLibrary() {
+void TelegramClient::init() {
 
     bool createLib = !m_telegram;
 
@@ -49,6 +49,15 @@
     }
 }
 
+void TelegramClient::shutdown() {
+
+    m_telegram->deleteLater();
+    m_telegram = 0;
+
+    DbManager::instance()->closeDatabase();
+}
+
+
 void TelegramClient::onAuthLoggedIn() {
 
     DbManager::instance()->initializeDatabase();

=== modified file 'qmlplugin/telegramclient.h'
--- qmlplugin/telegramclient.h	2014-08-19 10:07:39 +0000
+++ qmlplugin/telegramclient.h	2014-08-20 08:22:47 +0000
@@ -42,11 +42,10 @@
     void setDatabasePath(const QString &path) { Config::instance()->setDatabasePath(path); }
 
 
-    Q_INVOKABLE void initTelegramLibrary();
+    Q_INVOKABLE void init();
+    Q_INVOKABLE void shutdown();
 
     Q_INVOKABLE qint64 messagesSendMessage(TLInputPeer *peer, const QString &message);
-    Q_INVOKABLE void setContactsFilterTerm(QString term);
-    Q_INVOKABLE void setDialogsFilterTerm(QString term);
 
 Q_SIGNALS:
     void databasePathChanged(QString);

=== modified file 'uitest/ui/DialogsPage.qml'
--- uitest/ui/DialogsPage.qml	2014-08-18 21:18:34 +0000
+++ uitest/ui/DialogsPage.qml	2014-08-20 08:22:47 +0000
@@ -38,9 +38,29 @@
     }
 
 
+    Button {
+        id: sleepButton
+        text: "Sleep"
+
+        onClicked: {
+            if (text === "Sleep") {
+                text = "Wake";
+                telegramClient.shutdown();
+            } else {
+                text = "Sleep";
+                telegramClient.init();
+            }
+        }
+    }
+
     ListView {
         id: dialogsListView
-        anchors.fill: parent
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            top: sleepButton.bottom
+        }
 
         model: dialogsProxy
 

=== modified file 'uitest/ui/SignInPage.qml'
--- uitest/ui/SignInPage.qml	2014-08-18 21:18:34 +0000
+++ uitest/ui/SignInPage.qml	2014-08-20 08:22:47 +0000
@@ -23,7 +23,7 @@
             userTextField.enabled = false;
             signInButton.enabled = false;
             telegramClient.phoneNumber = userTextField.text;
-            telegramClient.initTelegramLibrary();
+            telegramClient.init();
         }
     }