Merge lp:~dpniel/dekko/fixOnlineDetection into lp:dekko/0.3

[Dan Chapman ]

THis is a temporary fix for detecting network changes on the device.

Ideally i want to use the c++ bindings but there has been some issues getting
them installed inside the click chroot.

This uses the NetworkingStatus qml component to work around this for now.

[Dan Chapman  (dpniel)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-06 15:35:56 +0000
+++ CMakeLists.txt	2014-10-09 08:40:33 +0000
@@ -564,6 +564,7 @@
 
     set(DEKKO_QML_UTILS
         ${DEKKO_QML_PATH}/Utils/Utils.js
+        ${DEKKO_QML_PATH}/Utils/DummyNetworkStatus.qml
     )
 
     set(DEKKO_ICON_DIR
 
=== added file 'qml/Utils/DummyNetworkStatus.qml'
--- qml/Utils/DummyNetworkStatus.qml	1970-01-01 00:00:00 +0000
+++ qml/Utils/DummyNetworkStatus.qml	2014-10-09 08:40:33 +0000
@@ -0,0 +1,29 @@
+/* Copyright (C) 2014 Dan Chapman <[e-mail]>
+
+   This file is part of Dekko email client for Ubuntu Devices/
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License or (at your option) version 3
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import QtQuick 2.2
+
+/* The Idea here is to fake the NetworkingStatus singleton which we bind to
+  when we are running in a unity7 desktop session as we use the internal
+  SystemNetworkWatcher.*/
+Item {
+    id: dummyNetworkStatus
+    property var limitations
+    property bool limitedBandwith
+    property bool online
+    property var status
+}
 
=== modified file 'qml/main.qml'
--- qml/main.qml	2014-10-02 11:16:47 +0000
+++ qml/main.qml	2014-10-09 08:40:33 +0000
@@ -19,11 +19,13 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItems
+import Ubuntu.Connectivity 1.0
 import DekkoCore 0.1
 import TrojitaCore 0.1
 import "./AccountsView"
 import "./Dialogs"
 import "./MailboxView"
+import "./Utils"
 
 MainView{
     id: dekko
@@ -317,6 +319,27 @@
     // COMPONENTS / CHILD OBJECTS
     //-------------------------------
 
+    DummyNetworkStatus {
+        id: dummyNetworkStatus
+    }
+    Connections {
+        id: networkStatus
+        target: imapAccess.isRunningOnMir ? NetworkingStatus : dummyNetworkStatus
+        onStatusChanged: {
+            if (status === NetworkingStatus.Offline) {
+                imapAccess.networkWatcher.setNetworkOffline()
+            }
+            if (status === NetworkingStatus.Online) {
+                if (NetworkingStatus.limitedBandwith) {
+                    imapAccess.networkWatcher.setNetworkExpensive()
+                } else {
+                    imapAccess.networkWatcher.setNetworkOnline()
+                }
+            }
+        }
+        onLimitedBandwithChanged: NetworkingStatus.limitedBandwith ? imapAccess.networkWatcher.setNetworkExpensive() : imapAccess.networkWatcher.setNetworkOnline()
+    }
+
     // TODO: Change this as sheets are going to be deprecated
     Component{
         id: sslSheetPage
 
=== modified file 'src/3rdParty/trojita/Imap/Model/ImapAccess.cpp'
--- src/3rdParty/trojita/Imap/Model/ImapAccess.cpp	2014-10-02 11:28:53 +0000
+++ src/3rdParty/trojita/Imap/Model/ImapAccess.cpp	2014-10-09 08:40:33 +0000
@@ -208,13 +208,14 @@
     }
     connect(m_imapModel, SIGNAL(needsSslDecision(QList<QSslCertificate>,QList<QSslError>)),
             this, SLOT(slotSslErrors(QList<QSslCertificate>,QList<QSslError>)));
-
-//    if (m_account->imapNeedsNetwork()) {
-//        m_netWatcher = new Imap::Mailbox::SystemNetworkWatcher(this, m_imapModel);
-//    } else {
-//        m_netWatcher = new Imap::Mailbox::DummyNetworkWatcher(this, m_imapModel);
-//    }
-    m_netWatcher = new Imap::Mailbox::DummyNetworkWatcher(this, m_imapModel);
+    // Here we use the SystemNetWatcher only if the settings say start online and we aren't
+    // running on a mir/unity8 device. Otherwise we are going to use the NetworkingStatus qml plugin
+    // until we have access to libconnectivity-qt1 in the click chroot. So just use the dummy watcher instead
+    if (m_account->imapNeedsNetwork() && !isRunningOnMir()) {
+        m_netWatcher = new Imap::Mailbox::SystemNetworkWatcher(this, m_imapModel);
+    } else {
+        m_netWatcher = new Imap::Mailbox::DummyNetworkWatcher(this, m_imapModel);
+    }
     QMetaObject::invokeMethod(m_netWatcher,
                               m_account->imapStartOffline() ?
                                   "setNetworkOffline" : "setNetworkOnline",
@@ -374,6 +375,11 @@
     return m_sslInfoIcon;
 }
 
+bool ImapAccess::isRunningOnMir() const
+{
+    return qgetenv("QT_QPA_PLATFORM") == "ubuntumirclient";
+}
+
 QString ImapAccess::mailboxListMailboxName() const
 {
     return m_mailboxSubtreeModel->rootIndex().data(Imap::Mailbox::RoleMailboxName).toString();
 
=== modified file 'src/3rdParty/trojita/Imap/Model/ImapAccess.h'
--- src/3rdParty/trojita/Imap/Model/ImapAccess.h	2014-10-02 11:28:53 +0000
+++ src/3rdParty/trojita/Imap/Model/ImapAccess.h	2014-10-09 08:40:33 +0000
@@ -69,6 +69,7 @@
     Q_PROPERTY(QStringList unfilteredCapabilities READ unfilteredCapabilities NOTIFY modelsChanged)
     Q_PROPERTY(UiUtils::PasswordWatcher *passwordWatcher READ passwordWatcher NOTIFY modelsChanged)
     Q_PROPERTY(bool hasThreadingCapabilities READ hasThreadingCapabilities NOTIFY modelsChanged)
+    Q_PROPERTY(bool isRunningOnMir READ isRunningOnMir CONSTANT)
     Q_ENUMS(Imap::ImapAccess::ConnectionMethod)
 
 public:
@@ -91,6 +92,7 @@
     QString sslInfoTitle() const;
     QString sslInfoMessage() const;
     UiUtils::Formatting::IconType sslInfoIcon() const;
+    bool isRunningOnMir() const;
 
     Q_INVOKABLE void openMessage(const QString &mailbox, const uint uid);
     Q_INVOKABLE QString prettySize(const uint bytes) const;