Merge lp:~alecu/unity-lens-music/silence-notifications into lp:unity-lens-music

[Alejandro J. Cura]

Update the text of the notifications on error

Update the text of the notifications on error

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-music-ci/10/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

This branch changes the text of the "performing purchase" notification, right at the moment any error happens:

When the purchase fails:
http://ubuntuone.com/5n1T5viEW9ttNOCwcFG4Lx

When the password is wrong:
http://ubuntuone.com/0eF2usg4CRunxko5SCcfcI

[lp:~alecu/unity-lens-music/silence-notifications]

141. By Alejandro J. Cura on 2013-07-11

merged with trunk

142. By Alejandro J. Cura on 2013-07-11

merge lp:~alecu/unity-lens-music/sign-opened-urls

143. By Alejandro J. Cura on 2013-07-11

merged from sign-open-urls

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-music-ci/13/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-music-ci/15/rebuild

review: Approve (continuous-integration)

Unmerged revisions

143. By Alejandro J. Cura on 2013-07-11

merged from sign-open-urls

142. By Alejandro J. Cura on 2013-07-11

merge lp:~alecu/unity-lens-music/sign-opened-urls

141. By Alejandro J. Cura on 2013-07-11

merged with trunk

140. By Alejandro J. Cura on 2013-06-06

update notifications on error

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-06-20 13:23:37 +0000
+++ src/musicstore-scope.vala	2013-07-11 01:18:29 +0000
@@ -28,6 +28,9 @@
   private const string ERROR_MESSAGE_NOT_LOGGED_IN = _("It seems you don't have an Ubuntu One account, or you are not logged in. To continue, please login and visit the Ubuntu One online store.");
   private const string ERROR_MESSAGE_NO_PAYMENT_METHOD = _("It seems you haven't set yet your preferred Ubuntu One payment method. To add a payment method, please visit the Ubuntu One online store.");
   private const string ERROR_MESSAGE_TECHNICAL_PROBLEM = _("Sorry, we have encountered a technical problem. No money has been taken from your account. To try your purchase again, please visit the Ubuntu One online store.");
+  private const string ERROR_MESSAGE_SHORT_TECHNICAL_PROBLEM = _("To try your purchase again, please visit the Ubuntu One online store.");
+  private const string ERROR_MESSAGE_WRONG_PASSWORD = _("Wrong password");
+  private const string NOTIFICATION_TITLE_PURCHASE_FAILED = _("Purchase failed");
   private const string UBUNTUONE_MUSIC_LOGIN = Config.LIBEXECDIR + "/ubuntuone-credentials/ubuntuone-music-login";
 
   public class MusicStoreScopeProxy : SimpleScope
@@ -89,11 +92,19 @@
     public Unity.ActivationResponse open_uri (string uri)
     {
       /* launch the music store streaming client  or the webstore or whatevz */
-      try {
-        AppInfo.launch_default_for_uri (uri, null);
-      } catch (GLib.Error e) {
-        warning ("Failed to open uri %s. %s", uri, e.message);
-      }
+        purchase_service.build_logged_url.begin(uri, (obj, res) => {
+            try {
+                var full_url = purchase_service.build_logged_url.end (res);
+                if (uri.has_prefix ("https://one.ubuntu.com/") || uri.has_prefix ("http://musicsearch.ubuntu.com/")) {
+                    AppInfo.launch_default_for_uri (full_url, null);
+                } else {
+                    AppInfo.launch_default_for_uri (uri, null);
+                }
+            } catch (PurchaseError e) {
+                debug ("Can't fetch credentials: %s to open url: %s", e.message, uri);
+                AppInfo.launch_default_for_uri (uri, null);
+            }
+        });
       return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
     }
 
@@ -133,7 +144,7 @@
         else if (album.price == 0)
             download_action.extra_text = _("Free");
 
-        download_action.activated.connect (open_uri);
+        download_action.activated.connect (show_purchase_preview);
 
         music_preview.add_action (download_action);
       }
@@ -344,25 +355,37 @@
         debug ("Error while showing notification: %s", e.message);
       }
 
+      Unity.ActivationResponse response;
+      string reason;
+
       try {
         purchase_service.purchase (album.purchase_sku, password);
         debug ("purchase completed.");
         notification.update (album.title, _("Purchase completed"), "");
-        try {
-          notification.show ();
-        } catch (GLib.Error e) {
-          debug ("Error while showing notification: %s", e.message);
-        }
-        return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+        reason = "purchase completed";
+        response = new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+
       } catch (PurchaseError e) {
+
         if (e is PurchaseError.WRONG_PASSWORD_ERROR) {
             debug ("wrong password error: %s", e.message);
-            return new Unity.ActivationResponse.with_preview (purchase_preview (uri, _("Wrong password")));
+            reason = ERROR_MESSAGE_WRONG_PASSWORD;
+            response = new Unity.ActivationResponse.with_preview (purchase_preview (uri, ERROR_MESSAGE_WRONG_PASSWORD));
         } else {
             debug ("got purchase error: %s", e.message);
-            return build_error_preview (uri, ERROR_MESSAGE_TECHNICAL_PROBLEM, album.formatted_price, _("Continue"), open_uri);
+            reason = ERROR_MESSAGE_SHORT_TECHNICAL_PROBLEM;
+            response = build_error_preview (uri, ERROR_MESSAGE_TECHNICAL_PROBLEM, album.formatted_price, _("Continue"), open_uri);
         }
-      }
+        notification.update (NOTIFICATION_TITLE_PURCHASE_FAILED, reason, "");
+      }
+
+      try {
+        notification.show ();
+        debug ("Showing updated notification: %s", reason);
+      } catch (GLib.Error e) {
+        debug ("Error while updating notification: %s", e.message);
+      }
+      return response;
     }
 
     public Unity.Preview purchase_preview (string uri, string? error_message)

=== modified file 'src/ubuntuone-webservices.vala'
--- src/ubuntuone-webservices.vala	2013-05-29 15:04:08 +0000
+++ src/ubuntuone-webservices.vala	2013-07-11 01:18:29 +0000
@@ -336,5 +336,19 @@
             purchase_with_default_payment (album_id, purchase_token);
             debug ("purchase completed.");
         }
+
+        public virtual async string build_logged_url (string dest_url) throws PurchaseError
+        {
+            const string U1_OAUTH_LOGIN = "https://one.ubuntu.com/api/1.0/from_oauth/?next=";
+            if (!got_credentials ()) {
+                yield fetch_credentials();
+            }
+            if (got_credentials ()) {
+                var full_url = U1_OAUTH_LOGIN + Soup.URI.encode(dest_url, null);
+                return oauth_sign(full_url);
+            } else {
+                return dest_url;
+            }
+        }
     }
 }

=== modified file 'tests/unit/test-ubuntuone-purchases.vala'
--- tests/unit/test-ubuntuone-purchases.vala	2013-05-29 15:04:08 +0000
+++ tests/unit/test-ubuntuone-purchases.vala	2013-07-11 01:18:29 +0000
@@ -128,6 +128,7 @@
     Test.add_data_func ("/Unit/PurchaseChecker/PurchaseDefaultPaymentBroken", test_purchase_with_default_payment_broken_json);
     Test.add_data_func ("/Unit/PurchaseChecker/PurchaseConnectionFails", test_purchase_with_default_payment_connection_fails);
     Test.add_data_func ("/Unit/PurchaseChecker/PurchaseDefaultPaymentFails", test_purchase_with_default_payment_fails);
+    Test.add_data_func ("/Unit/PurchaseChecker/SignUbuntuoneUrls", test_sign_ubuntuone_urls);
 
     return Test.run ();
   }
@@ -716,4 +717,26 @@
       assert (e is PurchaseError.PURCHASE_ERROR);
     }
   }
+
+  private static void test_sign_ubuntuone_urls ()
+  {
+    string dest = "https://one.ubuntu.com/contacts/";
+    var purchase_service = new BaseTestPurchaseService ();
+
+    MainLoop mainloop = new MainLoop ();
+    purchase_service.build_logged_url.begin(dest, (obj, res) => {
+        mainloop.quit ();
+        try {
+            var full_url = purchase_service.build_logged_url.end (res);
+            debug (full_url);
+            assert (full_url.contains("oauth_consumer_key"));
+            //GLib.Process.spawn_command_line_sync ("chromium-browser --incognito " + full_url);
+        } catch (PurchaseError e) {
+            warning ("Can't fetch credentials: %s", e.message);
+            assert_not_reached ();
+        }
+    });
+    assert (run_with_timeout (mainloop, 1000));
+    //assert (purchase_service._ubuntuone_credentials != null);
+  }
 }