Merge pull request #187 from jaoo/1074253

Bug 1074253 - User should be notified that revoking URLs without connectivity (no Data Connection or Server fail) is not possible. r=ferjm
mozilla-b2g · Oct 14, 2014 · 0cea1b8 · 0cea1b8
2 parents 4d62777 + dedb25e
commit 0cea1b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/js/controller.js b/js/controller.js
@@ -239,6 +239,15 @@
     },
 
     revokeUrl: function (token, date, callback) {
+      if (!navigator.onLine) {
+        LazyLoader.load([
+          'js/screens/error_screen.js'
+        ], function() {
+          var _ = navigator.mozL10n.get;
+          OfflineScreen.show(_('noConnection'));
+        });
+        return;
+      }
       ClientRequestHelper.revokeUrl(
         token,
         function onDeleted() {
@@ -258,6 +267,12 @@
         },
         function onError(e) {
           console.error('Error when revoking URL in server: ' + e);
+          LazyLoader.load([
+            'js/screens/error_screen.js'
+          ], function() {
+            var _ = navigator.mozL10n.get;
+            ErrorScreen.show(_('genericServerError'));
+          });
         }
       );
     },

diff --git a/js/version.js b/js/version.js
@@ -1 +1 @@
-Version = { id: '0a1833c' };
+Version = { id: '72b9899' };