Hardcode display of export screen, of expired banner

signalapp · Nov 16, 2018 · b8a5950 · b8a5950
1 parent 0378cdf
commit b8a5950
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/js/background.js b/js/background.js
@@ -126,9 +126,6 @@
 
     function init(firstRun) {
         window.removeEventListener('online', init);
-
-        // End of day, November 15th, 2018, Pacific Time (midnight the next day)
-        window.EXPIRATION_TIME = new Date('2018-11-16T08:00:00.000Z');
     }
 
     function onEmpty() {

diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
@@ -25,9 +25,12 @@
             this.listenTo(this.model.messageCollection, 'add remove', updateLastMessage);
             this.listenTo(this.model, 'newmessage', updateLastMessage);
 
-            extension.windows.onClosed(this.stopListening.bind(this));
             this.timeStampView = new Whisper.TimestampView({brief: true});
             this.model.updateLastMessage();
+
+            if (extension.windows) {
+                extension.windows.onClosed(this.stopListening.bind(this));
+            }
         },
 
         markSelected: function() {

diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
@@ -134,20 +134,13 @@
             this.networkStatusView = new Whisper.NetworkStatusView();
             this.$el.find('.network-status-container').append(this.networkStatusView.render().el);
 
-            extension.windows.onClosed(function() {
-                this.inboxListView.stopListening();
-            }.bind(this));
+            this.showUpgradeScreen();
+            this.showUpgradeBanner();
 
-            if (Whisper.Migration.inProgress()) {
-                if (this.appLoadingScreen) {
-                    this.appLoadingScreen.remove();
-                    this.appLoadingScreen = null;
-                }
-                this.showUpgradeScreen();
-                this.showUpgradeBanner();
-            }
-            else {
-                this.showUpgradeBanner();
+            if (extension.windows) {
+                extension.windows.onClosed(function() {
+                    this.inboxListView.stopListening();
+                }.bind(this));
             }
         },
         render_attributes: {
@@ -334,21 +327,8 @@
             Backbone.View.prototype.remove.call(this);
         },
         render_attributes: function() {
-            var DAY = 1000 * 60 * 60 * 24;
-            var timeLeft = window.EXPIRATION_TIME.getTime() - Date.now();
-
-            if (timeLeft <= 0) {
-                return {
-                    upgradeMessage: i18n('upgradeBannerExpired'),
-                    upgradeNow: i18n('upgradeNow'),
-                };
-            }
-
-            var daysLeft = Math.floor(timeLeft / DAY);
-
             return {
-                upgradeMessage: i18n('upgradeBanner'),
-                highlight: i18n('upgradeBannerTimespan', [daysLeft]),
+                upgradeMessage: i18n('upgradeBannerExpired'),
                 upgradeNow: i18n('upgradeNow'),
             };
         }

diff --git a/js/views/migration_view.js b/js/views/migration_view.js
@@ -294,9 +294,9 @@
 
     cancel: function() {
       Whisper.Migration.cancel().then(function() {
-        console.log('Restarting now');
-        window.location.reload();
-      });
+        console.log('Removing migration view');
+        this.remove();
+      }.bind(this));
     },
     selectStep: function(step) {
       this.step = step;