From 1446de4ec4294682832e525055f111d35fabf01c Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Wed, 16 Jan 2019 15:27:32 -0600
Subject: [PATCH] Local backups status message, beta 4

---
 .../javascripts/app/controllers/footer.js     | 20 +++++++++++++++++++
 .../app/services/desktopManager.js            |  7 +++++++
 .../privileges-management-modal.html.haml     |  2 +-
 app/assets/templates/footer.html.haml         |  9 +++++++--
 package-lock.json                             |  2 +-
 package.json                                  |  2 +-
 6 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js
index 15fcd07f2..0bb3add86 100644
--- a/app/assets/javascripts/app/controllers/footer.js
+++ b/app/assets/javascripts/app/controllers/footer.js
@@ -34,6 +34,26 @@ angular.module('app')
         this.securityUpdateAvailable = authManager.securityUpdateAvailable;
       })
 
+      $rootScope.$on("did-begin-local-backup", () => {
+        $timeout(() => {
+          this.arbitraryStatusMessage = "Saving local backup...";
+        })
+      });
+
+      $rootScope.$on("did-finish-local-backup", (event, data) => {
+        $timeout(() => {
+          if(data.success) {
+            this.arbitraryStatusMessage = "Successfully saved backup.";
+          } else {
+            this.arbitraryStatusMessage = "Unable to save local backup.";
+          }
+
+          $timeout(() => {
+            this.arbitraryStatusMessage = null;
+          }, 2000)
+        })
+      });
+
       this.openSecurityUpdate = function() {
         authManager.presentPasswordWizard("upgrade-security");
       }
diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js
index 58ce492d9..a4c02fb18 100644
--- a/app/assets/javascripts/app/services/desktopManager.js
+++ b/app/assets/javascripts/app/services/desktopManager.js
@@ -182,6 +182,13 @@ class DesktopManager {
     this.majorDataChangeHandler = handler;
   }
 
+  desktop_didBeginBackup() {
+    this.$rootScope.$broadcast("did-begin-local-backup");
+  }
+
+  desktop_didFinishBackup(success) {
+    this.$rootScope.$broadcast("did-finish-local-backup", {success: success});
+  }
 }
 
 angular.module('app').service('desktopManager', DesktopManager);
diff --git a/app/assets/templates/directives/privileges-management-modal.html.haml b/app/assets/templates/directives/privileges-management-modal.html.haml
index fb9654a05..ba57cb537 100644
--- a/app/assets/templates/directives/privileges-management-modal.html.haml
+++ b/app/assets/templates/directives/privileges-management-modal.html.haml
@@ -36,6 +36,6 @@
                 Note that when your application is unlocked, your data exists in temporary memory in an unencrypted state.
                 Privileges are meant to protect against unwanted access in the event of an unlocked application, but do not affect data encryption state.
               %p.sk-p
-                Privileges sync across your other devices (not including mobile); however, note that if you require
+                Privileges sync across your other devices; however, note that if you require
                 a "Local Passcode" privilege, and another device does not have a local passcode set up, the local passcode
                 requirement will be ignored on that device.
diff --git a/app/assets/templates/footer.html.haml b/app/assets/templates/footer.html.haml
index 31192f7eb..f8d3ce768 100644
--- a/app/assets/templates/footer.html.haml
+++ b/app/assets/templates/footer.html.haml
@@ -21,12 +21,17 @@
         %component-modal{"ng-if" => "room.showRoom", "component" => "room", "on-dismiss" => "ctrl.onRoomDismiss"}
 
 
+    .center
+      .sk-app-bar-item{"ng-show" => "ctrl.arbitraryStatusMessage"}
+        .sk-app-bar-item-column
+          %span.neutral.sk-label {{ctrl.arbitraryStatusMessage}}
+
     .right
 
-      .sk-app-bar-item{"ng-if" => "ctrl.securityUpdateAvailable", "ng-click" => "ctrl.openSecurityUpdate()"}
+      .sk-app-bar-item{"ng-show" => "ctrl.securityUpdateAvailable", "ng-click" => "ctrl.openSecurityUpdate()"}
         %span.success.sk-label Security update available.
 
-      .sk-app-bar-item{"ng-if" => "ctrl.newUpdateAvailable == true", "ng-click" => "ctrl.clickedNewUpdateAnnouncement()"}
+      .sk-app-bar-item{"ng-show" => "ctrl.newUpdateAvailable == true", "ng-click" => "ctrl.clickedNewUpdateAnnouncement()"}
         %span.info.sk-label New update available.
 
       .sk-app-bar-item.no-pointer{"ng-if" => "ctrl.lastSyncDate && !ctrl.isRefreshing"}
diff --git a/package-lock.json b/package-lock.json
index 794f7f09b..d36634c5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.3-beta3",
+  "version": "3.0.3-beta4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9cf453fa9..a33d15bf1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.3-beta3",
+  "version": "3.0.3-beta4",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",