From ad0f0118bcb879f7f2534ef597d9d306b0b9b6f4 Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Thu, 24 Apr 2014 15:01:37 -0600
Subject: [PATCH 1/4] fixes for new versioning:

---
 interface/src/Application.cpp | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4adb2f772a..4d9c70aeda 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3520,10 +3520,9 @@ void Application::parseVersionXml() {
     QString operatingSystem("ubuntu");
     #endif
 
-    QString releaseDate;
-    QString releaseNotes;
     QString latestVersion;
     QUrl downloadUrl;
+    QString releaseNotes("Unavailable");
     QObject* sender = QObject::sender();
 
     QXmlStreamReader xml(qobject_cast<QNetworkReply*>(sender));
@@ -3531,21 +3530,15 @@ void Application::parseVersionXml() {
         QXmlStreamReader::TokenType token = xml.readNext();
 
         if (token == QXmlStreamReader::StartElement) {
-            if (xml.name() == "ReleaseDate") {
-                xml.readNext();
-                releaseDate = xml.text().toString();
-            }
-            if (xml.name() == "ReleaseNotes") {
-                xml.readNext();
-                releaseNotes = xml.text().toString();
-            }
-            if (xml.name() == "Version") {
-                xml.readNext();
-                latestVersion = xml.text().toString();
-            }
+            xml.readNext();
             if (xml.name() == operatingSystem) {
                 xml.readNext();
-                downloadUrl = QUrl(xml.text().toString());
+                if (xml.name() == "version") {
+                    latestVersion = xml.text().toString();
+                }
+                if (xml.name() == "url") {
+                    downloadUrl = xml.text().toString();
+                }
             }
         }
     }

From 27002a94069b5ec13fecd49c12aada8c83ce7318 Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Thu, 24 Apr 2014 15:10:37 -0600
Subject: [PATCH 2/4] Casting to QUrl

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4d9c70aeda..20cab975a4 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3537,7 +3537,7 @@ void Application::parseVersionXml() {
                     latestVersion = xml.text().toString();
                 }
                 if (xml.name() == "url") {
-                    downloadUrl = xml.text().toString();
+                    downloadUrl = QUrl(xml.text().toString());
                 }
             }
         }

From f4c98a8fa4597832a1419107de1487d0e1edf14e Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Thu, 24 Apr 2014 16:21:49 -0600
Subject: [PATCH 3/4] Fixing xml parsing

---
 interface/src/Application.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 20cab975a4..8fdd41ca47 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3526,22 +3526,24 @@ void Application::parseVersionXml() {
     QObject* sender = QObject::sender();
 
     QXmlStreamReader xml(qobject_cast<QNetworkReply*>(sender));
-    while (!xml.atEnd() && !xml.hasError()) {
-        QXmlStreamReader::TokenType token = xml.readNext();
-
-        if (token == QXmlStreamReader::StartElement) {
-            xml.readNext();
-            if (xml.name() == operatingSystem) {
-                xml.readNext();
-                if (xml.name() == "version") {
+    
+    while(!xml.atEnd() && !xml.hasError()) {
+        if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == operatingSystem) {
+            while(!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == operatingSystem)) {
+                if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name().toString() == "version") {
+                    xml.readNext();
                     latestVersion = xml.text().toString();
                 }
-                if (xml.name() == "url") {
+                if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name().toString() == "url") {
+                    xml.readNext();
                     downloadUrl = QUrl(xml.text().toString());
                 }
+                xml.readNext();
             }
         }
+        xml.readNext();
     }
+    
     if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) {
         new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadUrl);
     }

From a21991c5c24e36cfcd5089f7247020a43902444d Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Thu, 24 Apr 2014 16:22:34 -0600
Subject: [PATCH 4/4] Fixing xml parsing

---
 interface/src/Application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8fdd41ca47..ab505ede93 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3527,9 +3527,9 @@ void Application::parseVersionXml() {
 
     QXmlStreamReader xml(qobject_cast<QNetworkReply*>(sender));
     
-    while(!xml.atEnd() && !xml.hasError()) {
+    while (!xml.atEnd() && !xml.hasError()) {
         if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == operatingSystem) {
-            while(!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == operatingSystem)) {
+            while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == operatingSystem)) {
                 if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name().toString() == "version") {
                     xml.readNext();
                     latestVersion = xml.text().toString();