From 857d9547a9fc4a00c6e621fb54720d047ba90864 Mon Sep 17 00:00:00 2001 From: Philipp Andreas Date: Wed, 14 Jan 2015 02:10:36 +0100 Subject: First prototype of pebble app store integration --- app/app.pro | 11 ++++++---- app/pebble.cpp | 3 +++ app/pebblestoreview.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++ app/pebblestoreview.h | 23 +++++++++++++++++++ app/qml/pages/AppStorePage.qml | 24 ++++++++++++++++++++ app/qml/pages/ManagerPage.qml | 4 ++++ 6 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 app/pebblestoreview.cpp create mode 100644 app/pebblestoreview.h create mode 100644 app/qml/pages/AppStorePage.qml diff --git a/app/app.pro b/app/app.pro index 97c6232..9600919 100644 --- a/app/app.pro +++ b/app/app.pro @@ -2,7 +2,7 @@ TARGET = pebble CONFIG += sailfishapp -QT += dbus +QT += dbus webkit quick-private webkit-private CONFIG += c++11 DEFINES += APP_VERSION=\\\"$$VERSION\\\" @@ -10,11 +10,13 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" SOURCES += \ pebble.cpp \ pebbledinterface.cpp \ - pebbleappiconprovider.cpp + pebbleappiconprovider.cpp \ + pebblestoreview.cpp HEADERS += \ pebbledinterface.h \ - pebbleappiconprovider.h + pebbleappiconprovider.h \ + pebblestoreview.h DBUS_INTERFACES += ../org.pebbled.Watch.xml @@ -30,7 +32,8 @@ OTHER_FILES += \ qml/images/* \ translations/*.ts \ pebble.desktop \ - pebble.png + pebble.png \ + qml/pages/AppStorePage.qml CONFIG += sailfishapp_i18n TRANSLATIONS += translations/pebble-es.ts diff --git a/app/pebble.cpp b/app/pebble.cpp index 22f6ac1..dd3c915 100644 --- a/app/pebble.cpp +++ b/app/pebble.cpp @@ -34,6 +34,7 @@ #include #include "pebbledinterface.h" #include "pebbleappiconprovider.h" +#include "pebblestoreview.h" int main(int argc, char *argv[]) { @@ -48,6 +49,8 @@ int main(int argc, char *argv[]) qmlRegisterUncreatableType("org.pebbled", 0, 1, "PebbledInterface", "Please use pebbled context property"); + qmlRegisterType("org.pebbled", 0, 1, "PebbleStoreView"); + QScopedPointer view(SailfishApp::createView()); QScopedPointer pebbled(new PebbledInterface); QScopedPointer appicons(new PebbleAppIconProvider(pebbled.data())); diff --git a/app/pebblestoreview.cpp b/app/pebblestoreview.cpp new file mode 100644 index 0000000..011d056 --- /dev/null +++ b/app/pebblestoreview.cpp @@ -0,0 +1,50 @@ +#include "pebblestoreview.h" +#include +#include +#include + +PebbleStoreView::PebbleStoreView() + : QQuickWebView() +{ + connect(this, SIGNAL(navigationRequested(QWebNavigationRequest*)), this, SLOT(onNavigationRequested(QWebNavigationRequest*))); +} + + +void PebbleStoreView::onNavigationRequested(QWebNavigationRequest* request) +{ + if (request->url().scheme() == "pebble") { + if (request->url().host() == "login") { + QUrlQuery *accessTokenFragment = new QUrlQuery(request->url().fragment()); + qDebug()<<"login"<queryItemValue("access_token"); + emit loginSuccess(accessTokenFragment->queryItemValue("access_token")); + } + } + if (request->url().scheme() == "pebble-method-call-js-frame") { + QString urlStr = ""; + + //Basic parse error string + QRegExp reg(".*; source was \"(.*)\";.*"); + reg.setMinimal(true); + if (reg.indexIn(request->url().errorString()) > -1) { + urlStr = reg.cap(1); + reg.setPattern("method=(.*)&args=(.*)$"); + reg.setMinimal(true); + if (reg.indexIn(urlStr) > -1) { + QString methodStr = reg.cap(1); + QString argsStr = QUrl::fromPercentEncoding(reg.cap(2).toUtf8()); + emit call(methodStr, argsStr); + if (methodStr == "loadAppToDeviceAndLocker") { + QJsonDocument jsonResponse = QJsonDocument::fromJson(argsStr.toUtf8()); + QJsonObject jsonObject = jsonResponse.object(); + QJsonObject data = jsonObject.value("data").toObject(); + qDebug()<<"download"< +#include +#include + +class PebbleStoreView : public QQuickWebView +{ + Q_OBJECT +public: + PebbleStoreView(); + +public slots: + void onNavigationRequested(QWebNavigationRequest* request); + +signals: + void loginSuccess(const QString & accessToken); + void downloadPebbleApp(const QString & title, const QString & downloadUrl); + void call(const QString &, const QString &); +}; + +#endif // PEBBLESTOREVIEW_H diff --git a/app/qml/pages/AppStorePage.qml b/app/qml/pages/AppStorePage.qml new file mode 100644 index 0000000..95bb2db --- /dev/null +++ b/app/qml/pages/AppStorePage.qml @@ -0,0 +1,24 @@ +import QtQuick 2.0 +import QtQml 2.1 +import Sailfish.Silica 1.0 +import org.pebbled 0.1 + +Page { + id: page + + PebbleStoreView { + id: webview + anchors.fill: parent + url: "https://auth.getpebble.com/oauth/authorize?client_id=f88739e8e7a696c411236c41afc81cbef16dc54c3ff633d92dd4ceb0e5a25e5f&response_type=token&mid=xxx&pid=xxx&platform=android&mobile=sign_in&redirect_uri=pebble%3A%2F%2Flogin" + + onLoginSuccess: { + console.log("ON Login " + accessToken); + webview.url = "https://apps-prod.getpebble.com/en_US/?access_token=" + accessToken + "#/watchfaces" + } + + onDownloadPebbleApp: { + console.log("ON DOWNLOAD " + title); + console.log(downloadUrl); + } + } +} diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index 814c9d8..c0dd411 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -65,6 +65,10 @@ Page { text: qsTr("About") onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) } + MenuItem { + text: qsTr("Pebble Appstore") + onClicked: pageStack.push(Qt.resolvedUrl("AppStorePage.qml")) + } } Column { -- cgit v1.2.3 From 0da3325dcab2ebd419d1d0b1a59428f3201a5732 Mon Sep 17 00:00:00 2001 From: Philipp Andreas Date: Wed, 14 Jan 2015 21:52:36 +0100 Subject: Working appstore --- app/pebblestoreview.cpp | 107 +++++++++++++++++++++++++++++++++++-- app/pebblestoreview.h | 35 ++++++++++-- app/qml/pages/AppStorePage.qml | 95 ++++++++++++++++++++++++++++---- app/qml/pages/InstallAppDialog.qml | 4 ++ app/qml/pages/ManagerPage.qml | 4 -- 5 files changed, 225 insertions(+), 20 deletions(-) diff --git a/app/pebblestoreview.cpp b/app/pebblestoreview.cpp index 011d056..0ea5c14 100644 --- a/app/pebblestoreview.cpp +++ b/app/pebblestoreview.cpp @@ -1,22 +1,117 @@ #include "pebblestoreview.h" #include -#include -#include +#include +#include +#include PebbleStoreView::PebbleStoreView() : QQuickWebView() { connect(this, SIGNAL(navigationRequested(QWebNavigationRequest*)), this, SLOT(onNavigationRequested(QWebNavigationRequest*))); + + this->m_networkManager = new QNetworkAccessManager(this); + connect(this->m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(onNetworkReplyFinished(QNetworkReply*))); + + this->m_configUrl = QUrl("https://boot.getpebble.com/api/config/android/v1/3"); + this->m_downloadInProgress = false; + emit downloadInProgressChanged(); + + //Fetching urls to use by the store + fetchData(this->m_configUrl); +} + +QString PebbleStoreView::accessToken() const +{ + return this->m_accessToken; +} + +void PebbleStoreView::setAccessToken(const QString &accessToken) +{ + this->m_accessToken = accessToken; + emit accessTokenChanged(accessToken); +} + +void PebbleStoreView::logout() +{ + setAccessToken(""); + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("authentication").toString())); +} + +bool PebbleStoreView::loggedin() +{ + return (!this->m_accessToken.isEmpty()); } +bool PebbleStoreView::downloadInProgress() +{ + return this->m_downloadInProgress; +} + +void PebbleStoreView::gotoWatchFaces() +{ + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("appstore/watchfaces").toString())); +} + +void PebbleStoreView::gotoWatchApps() +{ + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("appstore/watchapps").toString())); +} + +void PebbleStoreView::fetchData(QUrl url) +{ + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Cache-Control", "no-cache"); + this->m_networkManager->get(request); +} + +void PebbleStoreView::onNetworkReplyFinished(QNetworkReply* reply) +{ + qDebug()<<"Download finished"; + if (reply->request().url() == this->m_configUrl) { + QJsonDocument jsonResponse = QJsonDocument::fromJson(reply->readAll()); + QJsonObject jsonObject = jsonResponse.object(); + this->storeConfigObject = jsonObject.value("config").toObject(); + + if (this->m_accessToken.isEmpty()) { + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("authentication").toString())); + } else { + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("onboarding/get_some_apps").toString())); + } + } else { + QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); + QFile file(dataDir.absoluteFilePath("apps") + "/" + this->downloadObject.value("uuid").toString() + ".pbw"); + file.open(QIODevice::WriteOnly); + file.write(reply->readAll()); + file.close(); + + qDebug()<downloadObject; + + this->m_downloadInProgress = false; + emit downloadInProgressChanged(); + } +} + +QUrl PebbleStoreView::prepareUrl(QString baseUrl) +{ + baseUrl = baseUrl.replace("$$user_id$$", "ZZZ"); + baseUrl = baseUrl.replace("$$phone_id$$", "XXX"); + baseUrl = baseUrl.replace("$$pebble_id$$", "YYY"); + baseUrl = baseUrl.replace("$$access_token$$", this->m_accessToken); + + qDebug()<url().scheme() == "pebble") { if (request->url().host() == "login") { QUrlQuery *accessTokenFragment = new QUrlQuery(request->url().fragment()); - qDebug()<<"login"<queryItemValue("access_token"); - emit loginSuccess(accessTokenFragment->queryItemValue("access_token")); + this->m_accessToken = accessTokenFragment->queryItemValue("access_token"); + emit accessTokenChanged(accessTokenFragment->queryItemValue("access_token")); + setUrl(prepareUrl(this->storeConfigObject.value("webviews").toObject().value("onboarding/get_some_apps").toString())); } } if (request->url().scheme() == "pebble-method-call-js-frame") { @@ -38,6 +133,10 @@ void PebbleStoreView::onNavigationRequested(QWebNavigationRequest* request) QJsonObject jsonObject = jsonResponse.object(); QJsonObject data = jsonObject.value("data").toObject(); qDebug()<<"download"<downloadObject = data;; + this->m_downloadInProgress = true; + emit downloadInProgressChanged(); + fetchData(QUrl(data.value("pbw_file").toString())); emit downloadPebbleApp(data.value("title").toString(), data.value("pbw_file").toString()); } } diff --git a/app/pebblestoreview.h b/app/pebblestoreview.h index f0d18f6..a19b43d 100644 --- a/app/pebblestoreview.h +++ b/app/pebblestoreview.h @@ -3,21 +3,50 @@ #include #include -#include +#include +#include +#include +#include class PebbleStoreView : public QQuickWebView { Q_OBJECT public: PebbleStoreView(); + Q_PROPERTY(bool loggedin READ loggedin NOTIFY accessTokenChanged) + Q_PROPERTY(bool downloadInProgress READ downloadInProgress NOTIFY downloadInProgressChanged) + Q_PROPERTY(QString accessToken READ accessToken WRITE setAccessToken NOTIFY accessTokenChanged) + + bool loggedin(); + bool downloadInProgress(); + QString accessToken() const; + void setAccessToken(const QString &accessToken); public slots: + void gotoWatchFaces(); + void gotoWatchApps(); + void logout(); + +private slots: void onNavigationRequested(QWebNavigationRequest* request); + void onNetworkReplyFinished(QNetworkReply* reply); signals: - void loginSuccess(const QString & accessToken); - void downloadPebbleApp(const QString & title, const QString & downloadUrl); + void accessTokenChanged(const QString & accessToken); + void downloadPebbleApp(const QString & downloadTitle, const QString & downloadUrl); + void downloadInProgressChanged(); void call(const QString &, const QString &); + +private: + QNetworkAccessManager* m_networkManager; + QUrl m_configUrl; + QString m_accessToken; + QJsonObject downloadObject; + QJsonObject storeConfigObject; + bool m_downloadInProgress; + + QUrl prepareUrl(QString baseUrl); + void fetchData(QUrl url); }; #endif // PEBBLESTOREVIEW_H diff --git a/app/qml/pages/AppStorePage.qml b/app/qml/pages/AppStorePage.qml index 95bb2db..680ac50 100644 --- a/app/qml/pages/AppStorePage.qml +++ b/app/qml/pages/AppStorePage.qml @@ -2,23 +2,100 @@ import QtQuick 2.0 import QtQml 2.1 import Sailfish.Silica 1.0 import org.pebbled 0.1 +import org.nemomobile.configuration 1.0 Page { id: page - PebbleStoreView { - id: webview + ConfigurationGroup { + id: settings + path: "/org/pebbled/settings" + property string storeAccessToken: "" + } + + SilicaFlickable { + id: flickable anchors.fill: parent - url: "https://auth.getpebble.com/oauth/authorize?client_id=f88739e8e7a696c411236c41afc81cbef16dc54c3ff633d92dd4ceb0e5a25e5f&response_type=token&mid=xxx&pid=xxx&platform=android&mobile=sign_in&redirect_uri=pebble%3A%2F%2Flogin" + contentHeight: column.height + webview.height + + PullDownMenu { + visible: webview.loggedin; - onLoginSuccess: { - console.log("ON Login " + accessToken); - webview.url = "https://apps-prod.getpebble.com/en_US/?access_token=" + accessToken + "#/watchfaces" + MenuItem { + text: qsTr("Logout") + onClicked: { + webview.logout(); + } + } } - onDownloadPebbleApp: { - console.log("ON DOWNLOAD " + title); - console.log(downloadUrl); + Column { + id: column + width: page.width + spacing: Theme.paddingLarge + + PageHeader { + title: qsTr("Pebble Appstore") + } + + Row { + anchors.horizontalCenter: parent.horizontalCenter + visible: webview.loggedin; + Button { + text: qsTr("WatchApps") + onClicked: { + webview.gotoWatchApps(); + } + } + Button { + text: qsTr("WatchFaces") + onClicked: { + webview.gotoWatchFaces(); + } + } + } + + Column { + id: download + visible: webview.downloadInProgress + width: parent.width + + Label { + anchors.horizontalCenter: parent.horizontalCenter + id: downloadLabel + text: qsTr("Downloading...") + } + + BusyIndicator { + anchors.horizontalCenter: parent.horizontalCenter + running: true + size: BusyIndicatorSize.Large + } + } + } + + PebbleStoreView { + id: webview + visible: !webview.downloadInProgress + width: page.width + height: page.height - column.height + + anchors { + top: column.bottom + } + + accessToken: settings.storeAccessToken + + onAccessTokenChanged: { + settings.storeAccessToken = accessToken; + } + + onDownloadPebbleApp: { + downloadLabel.text = qsTr("Downloading %1...").arg(downloadTitle) + } } } + + } + diff --git a/app/qml/pages/InstallAppDialog.qml b/app/qml/pages/InstallAppDialog.qml index ecc3d78..4661cf0 100644 --- a/app/qml/pages/InstallAppDialog.qml +++ b/app/qml/pages/InstallAppDialog.qml @@ -84,6 +84,10 @@ Dialog { } } + MenuItem { + text: qsTr("Pebble Appstore") + onClicked: pageStack.push(Qt.resolvedUrl("AppStorePage.qml")) + } } currentIndex: -1 diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index c0dd411..814c9d8 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -65,10 +65,6 @@ Page { text: qsTr("About") onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) } - MenuItem { - text: qsTr("Pebble Appstore") - onClicked: pageStack.push(Qt.resolvedUrl("AppStorePage.qml")) - } } Column { -- cgit v1.2.3