Merge lp:~alecu/unity-scope-click/uncaught-error into lp:unity-scope-click

[Alejandro J. Cura]

Catch more download errors, and ask for credentials on 401

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/63/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-03 17:28:40 +0000
+++ src/click-scope.vala	2013-10-03 22:37:23 +0000
@@ -187,7 +187,7 @@
             } else if (action_id.has_prefix(ACTION_DOWNLOAD_FAILED)) {
                 // we don't have access to the error message in SearchMetadata, LP: #1233836
                 var errormsg = "please check ubuntu-download-manager.log";
-                throw new ClickScopeError.INSTALL_ERROR("Installation failed: %s".printf(errormsg));
+                preview = build_error_preview ("Installation failed: %s".printf(errormsg));
             } else if (action_id == ACTION_DOWNLOAD_COMPLETED) {
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);
@@ -220,7 +220,7 @@
             if (scope_error is ClickScopeError.LOGIN_ERROR) {
                 preview = build_login_error_preview (scope_error.message);
             } else {
-                throw scope_error;
+                preview = build_error_preview (scope_error.message);
             }
         } catch (GLib.Error e) {
             debug ("Error building preview: %s", e.message);
@@ -265,6 +265,13 @@
             var download_object_path = yield signed_download.start_download (download_url, app_id);
             debug ("download started: %s", download_object_path);
             return download_object_path;
+        } catch (DownloadError download_error) {
+            debug ("Got DownloadError: %s", download_error.message);
+            if (download_error is DownloadError.INVALID_CREDENTIALS) {
+                throw new ClickScopeError.LOGIN_ERROR (download_error.message);
+            } else {
+                throw new ClickScopeError.INSTALL_ERROR (download_error.message);
+            }
         } catch (CredentialsError cred_error) {
             debug ("Got CredentialsError trying to fetch token.");
             throw new ClickScopeError.LOGIN_ERROR (cred_error.message);
@@ -381,7 +388,7 @@
         GLib.Source.remove (app_search_id);
     }
     app_search_id = GLib.Timeout.add_seconds (10, () => {
-        find_available_apps (search_query);
+        find_available_apps.begin (search_query);
         return false;
     });
   }

=== modified file 'src/download-manager.vala'
--- src/download-manager.vala	2013-09-21 00:17:03 +0000
+++ src/download-manager.vala	2013-10-03 22:37:23 +0000
@@ -81,7 +81,8 @@
 }
 
 errordomain DownloadError {
-    DOWNLOAD_ERROR
+    DOWNLOAD_ERROR,
+    INVALID_CREDENTIALS
 }
 
 public string? get_download_progress (string app_id) {
@@ -123,9 +124,10 @@
             credentials[TOKEN], credentials[TOKEN_SECRET]);
     }
 
-    async string fetch_click_token(string download_url) {
+    async string fetch_click_token(string download_url) throws DownloadError {
         string click_token = null;
         const string HEAD = "HEAD";
+        DownloadError error = null;
 
         var message = new Soup.Message (HEAD, sign_url(HEAD, download_url));
         http_session.queue_message (message, (session, message) => {
@@ -133,19 +135,31 @@
             if (message.status_code == Soup.KnownStatusCode.OK && click_token != null) {
                 debug ("Click token received");
             } else {
-                if (message.status_code == Soup.KnownStatusCode.OK) {
-                    debug ("No X-Click-Token header received from download url: %s", download_url);
-                    click_token = "fake token";
-                } else {
-                    debug ("Web request failed: HTTP %u %s - %s",
+                switch (message.status_code) {
+                case Soup.KnownStatusCode.OK:
+                    var msg = "No X-Click-Token header received. Url was: %s".printf(download_url);
+                    debug (msg);
+                    error = new DownloadError.DOWNLOAD_ERROR (msg);
+                    break;
+                case Soup.KnownStatusCode.UNAUTHORIZED:
+                    var msg = "The Ubuntu One credentials are invalid, please log in again.";
+                    debug (msg);
+                    error = new DownloadError.INVALID_CREDENTIALS (msg);
+                    break;
+                default:
+                    var msg = "Web request failed: HTTP %u %s - %s".printf(
                            message.status_code, message.reason_phrase, download_url);
-                    click_token = "fake token";
+                    debug (msg);
+                    error = new DownloadError.DOWNLOAD_ERROR (message.reason_phrase);
+                    break;
                 }
-                //error = new PurchaseError.PURCHASE_ERROR (message.reason_phrase);
             }
             fetch_click_token.callback ();
         });
         yield;
+        if (error != null) {
+            throw error;
+        }
         return click_token;
     }