From d1eacbb574e2215b101531f4b684882eed35529e Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sat, 25 Apr 2020 17:15:57 +0200
Subject: [PATCH] more robust entering protected session and the following
 protection of a note

---
 src/public/app/services/app_context.js       |  6 ------
 src/public/app/services/protected_session.js | 12 +++++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js
index 6dbcfa2db..f4537f087 100644
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -94,12 +94,6 @@ class AppContext extends Component {
     getComponentByEl(el) {
         return $(el).closest(".component").prop('component');
     }
-
-    async protectedSessionStartedEvent() {
-        await treeCache.loadInitialTree();
-
-        this.triggerEvent('treeCacheReloaded');
-    }
 }
 
 const appContext = new AppContext();
diff --git a/src/public/app/services/protected_session.js b/src/public/app/services/protected_session.js
index 9e49de015..100df55e1 100644
--- a/src/public/app/services/protected_session.js
+++ b/src/public/app/services/protected_session.js
@@ -1,13 +1,10 @@
-import treeService from './tree.js';
 import utils from './utils.js';
 import server from './server.js';
 import protectedSessionHolder from './protected_session_holder.js';
 import toastService from "./toast.js";
 import ws from "./ws.js";
 import appContext from "./app_context.js";
-
-const $enterProtectedSessionButton = $("#enter-protected-session-button");
-const $leaveProtectedSessionButton = $("#leave-protected-session-button");
+import treeCache from "./tree_cache.js";
 
 let protectedSessionDeferred = null;
 
@@ -45,6 +42,10 @@ async function setupProtectedSession(password) {
     protectedSessionHolder.setProtectedSessionId(response.protectedSessionId);
     protectedSessionHolder.touchProtectedSession();
 
+    await treeCache.loadInitialTree();
+
+    await appContext.triggerEvent('treeCacheReloaded');
+
     appContext.triggerEvent('protectedSessionStarted');
 
     if (protectedSessionDeferred !== null) {
@@ -54,9 +55,6 @@ async function setupProtectedSession(password) {
         protectedSessionDeferred = null;
     }
 
-    $enterProtectedSessionButton.hide();
-    $leaveProtectedSessionButton.show();
-
     toastService.showMessage("Protected session has been started.");
 }