1 files changed, 65 insertions, 31 deletions
diff --git a/examples/quick/demos/tweetsearch/content/TweetsModel.qml b/examples/quick/demos/tweetsearch/content/TweetsModel.qml
index cd91a787b7..7d813d18c8 100644
--- a/examples/quick/demos/tweetsearch/content/TweetsModel.qml
+++ b/examples/quick/demos/tweetsearch/content/TweetsModel.qml
@@ -39,53 +39,87 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
+import "tweetsearch.js" as Helper
 
 Item {
     id: wrapper
 
-    property variant model: xmlModel
+    // Insert valid consumer key and secret tokens below
+    // See https://dev.twitter.com/apps
+//! [auth tokens]
+    property string consumerKey : ""
+    property string consumerSecret : ""
+//! [auth tokens]
+    property string bearerToken : ""
+
+    property variant model: tweets
     property string from : ""
     property string phrase : ""
 
-    property string mode : "everyone"
-    property int status: xmlModel.status
-
-    function reload() { xmlModel.reload(); }
-
-    property bool isLoading: status == XmlListModel.Loading
+    property int status: XMLHttpRequest.UNSENT
+    property bool isLoading: status === XMLHttpRequest.LOADING
     property bool wasLoading: false
     signal isLoaded
 
-    XmlListModel {
-        id: xmlModel
+    ListModel { id: tweets }
 
-        onStatusChanged: {
-            if (status == XmlListModel.Ready && wasLoading == true)
-                wrapper.isLoaded()
-            if (status == XmlListModel.Loading)
-                wasLoading = true;
-            else
-                wasLoading = false;
-        }
+    function encodePhrase(x) { return encodeURIComponent(x); }
 
-        function encodePhrase(x) { return encodeURIComponent(x); }
+    function reload() {
+        tweets.clear()
 
-        source: (from == "" && phrase == "") ? "" :
-            'http://search.twitter.com/search.atom?from='+from+"&rpp=10&phrase="+encodePhrase(phrase)
+        if (from == "" && phrase == "")
+            return;
 
-        namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom'; " +
-                               "declare namespace twitter=\"http://api.twitter.com/\";";
+//! [requesting]
+        var req = new XMLHttpRequest;
+        req.open("GET", "https://api.twitter.com/1.1/search/tweets.json?from=" + from +
+                        "&count=10&q=" + encodePhrase(phrase));
+        req.setRequestHeader("Authorization", "Bearer " + bearerToken);
+        req.onreadystatechange = function() {
+            status = req.readyState;
+            if (status === XMLHttpRequest.DONE) {
+                var objectArray = JSON.parse(req.responseText);
+                if (objectArray.errors !== undefined)
+                    console.log("Error fetching tweets: " + objectArray.errors[0].message)
+                else {
+                    for (var key in objectArray.statuses) {
+                        var jsonObject = objectArray.statuses[key];
+                        tweets.append(jsonObject);
+                    }
+                }
+                if (wasLoading == true)
+                    wrapper.isLoaded()
+            }
+            wasLoading = (status === XMLHttpRequest.LOADING);
+        }
+        req.send();
+//! [requesting]
+    }
 
-        query: "/feed/entry"
+    onPhraseChanged: reload();
+    onFromChanged: reload();
 
-        XmlRole { name: "id"; query: "id/string()" }
-        XmlRole { name: "content"; query: "content/string()" }
-        XmlRole { name: "published"; query: "published/string()" }
-        XmlRole { name: "source"; query: "twitter:source/string()" }
-        XmlRole { name: "name"; query: "author/name/string()" }
-        XmlRole { name: "uri"; query: "author/uri/string()" }
-        XmlRole { name: "image"; query: "link[@rel = 'image']/@href/string()" }
+    Component.onCompleted: {
+        if (consumerKey === "" || consumerSecret == "") {
+            bearerToken = encodeURIComponent(Helper.demoToken())
+            return;
+        }
 
+        var authReq = new XMLHttpRequest;
+        authReq.open("POST", "https://api.twitter.com/oauth2/token");
+        authReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+        authReq.setRequestHeader("Authorization", "Basic " + Qt.btoa(consumerKey + ":" + consumerSecret));
+        authReq.onreadystatechange = function() {
+            if (authReq.readyState === XMLHttpRequest.DONE) {
+                var jsonResponse = JSON.parse(authReq.responseText);
+                if (jsonResponse.errors !== undefined)
+                    console.log("Authentication error: " + jsonResponse.errors[0].message)
+                else
+                    bearerToken = jsonResponse.access_token;
+            }
+        }
+        authReq.send("grant_type=client_credentials");
     }
+
 }