Merge lp:~mardy/friends-app/app-access2 into lp:friends-app

[Alberto Mardegan]

Request access to online accounts

When no enabled accounts are found, ask the Online Accounts trusted helper to create a new account or enabled an existing one.

UI wise, we should probably make this Setup screen accessible even if there are already some accounts enabled.

Request access to online accounts

When no enabled accounts are found, ask the Online Accounts trusted helper to create a new account or enabled an existing one.

UI wise, we should probably make this Setup screen accessible even if there are already some accounts enabled.

[David Barth (dbarth)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/friends-app-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4066/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3550/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3653/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5976/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4981

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-app-ci/43/rebuild

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

This jenkins failure is ignorable because it's not testing with the necessary depends in place. The CI Train silo will be able to test this much more effectively.

review: Approve

[lp:~mardy/friends-app/app-access2]

152. By Alberto Mardegan on 2014-04-02

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/friends-app-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-ci/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4063/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3854/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4569
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4569/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4098
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4098/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6314/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5564

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-app-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/friends-app/app-access2]

153. By Alberto Mardegan on 2014-05-02

Merge from trunk

[ Barry Warsaw ]
* Port autopilot tests to Python 3. Bump Standards-Version to 3.9.5
* debian/control: alternatively depend on the OpenGLES version of
  qtdeclarative5-ubuntu-ui-toolkit-plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/friends-app-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-ci/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5192
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4291/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4860
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4860/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6519/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6695

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-app-ci/46/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-05-01 14:18:24 +0000
+++ debian/control	2014-05-02 07:38:13 +0000
@@ -20,8 +20,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         qtdeclarative5-accounts-plugin,
+         qtdeclarative5-accounts-plugin (>= 0.4),
          qtdeclarative5-friends0.2,
+         qtdeclarative5-online-accounts-client0.1 (>= 0.3),
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          qtdeclarative5-u1db1.0,

=== modified file 'qml/Setup.qml'
--- qml/Setup.qml	2014-03-06 13:35:39 +0000
+++ qml/Setup.qml	2014-05-02 07:38:13 +0000
@@ -16,43 +16,42 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-
-Column {
-
-    Label {
-        id: header
-        text: i18n.tr("No online accounts configured")
-        anchors.horizontalCenter: parent.horizontalCenter
-        fontSize: "large"
-        font.bold: true
-    }
-
-    Label {
-        text: i18n.tr("To configure accounts, go to System Settings and choose \"Online Accounts\".")
-        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        horizontalAlignment: Text.AlignHCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: parent.width
-    }
-
-//    Item {
-//        height: units.gu(4)
-//        width: parent.width
-//    }
-
-//    Button {
-//        id: addButton
-//        anchors.horizontalCenter: parent.horizontalCenter
-
-//        text: i18n.tr("Add account...")
-//        width: header.width - units.gu(2)//Math.min(header.width, parent.width * 3/4)
-//        onClicked: {
-//            console.log ("Add Accounts activated");
-//            Qt.openUrlExternally("settings:///system/credentials");
-
-//        }
-//    }
-
-
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+
+ListView {
+    id: listView
+    header: headerComponent
+    model: providerModel
+    delegate: ListItem.Standard {
+        text: model.displayName
+        iconName: model.iconName
+        width: listView.width
+        onClicked: {
+            setup.providerId = providerId
+            setup.exec()
+        }
+    }
+
+    Component {
+        id: headerComponent
+        Label {
+            text: i18n.tr("No online accounts configured")
+            anchors.horizontalCenter: parent.horizontalCenter
+            fontSize: "large"
+            font.bold: true
+        }
+    }
+
+    ProviderModel {
+        id: providerModel
+        applicationId: "friends"
+    }
+
+    Setup {
+        id: setup
+        applicationId: "friends"
+    }
 }
 

=== modified file 'qml/friends-app.qml'
--- qml/friends-app.qml	2014-03-06 13:35:39 +0000
+++ qml/friends-app.qml	2014-05-02 07:38:13 +0000
@@ -93,14 +93,19 @@
         id: accounts
         serviceType: "microblogging"
 
-        onCountChanged: {
-            if (pageStack.currentPage === noAccountsPage && count > 0) {
-                pageStack.pop()
-            }
-
-            if (pageStack.currentPage !== noAccountsPage && count === 0) {
-                pageStack.push(noAccountsPage)
-            }
+        onCountChanged: checkAccountsPage()
+    }
+
+    function checkAccountsPage() {
+        // If there's no current page, it means the UI is not fully initialized
+        if (!pageStack.currentPage) return
+
+        if (pageStack.currentPage === noAccountsPage && accounts.count > 0) {
+            pageStack.pop()
+        }
+
+        if (pageStack.currentPage !== noAccountsPage && accounts.count === 0) {
+            pageStack.push(noAccountsPage)
         }
     }
 
@@ -114,10 +119,8 @@
         Component.onCompleted: {
             console.log ("accounts.count: "+accounts.count)
 
-            if (accounts.count < 1)
-                pageStack.push(noAccountsPage)
-            else
-                pageStack.push(feedTabs)
+            pageStack.push(feedTabs)
+            checkAccountsPage()
         }
 
         Page {
@@ -126,10 +129,8 @@
             Setup {
                 id: noAccounts
                 anchors {
-                    centerIn: parent
+                    fill: parent
                 }
-
-                width: parent.width - units.gu(4)
             }
             visible: false
             tools: ToolbarItems {