From 9a59f9f80a47f06ee90b2f5f7c5aa31fb79a6602 Mon Sep 17 00:00:00 2001
From: silas <silas@silas.link>
Date: Sat, 1 Dec 2018 18:47:13 +0100
Subject: [PATCH] Nicht mehr auf UserManager warten

---
 public/js/app.js                  | 9 ++++++++-
 src/js/init.js                    | 3 ++-
 src/js/lib/pwa-user-management.js | 8 +++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index a47d420..a61f88e 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -4508,10 +4508,12 @@ class UserManager {
         return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id);
     }
 }
+UserManager.waitForData = true;
+
 
 InitPromise.addPromise(function(app){
     UserManager.init(app);
-    return UserManager.fetchMe("u/me").then(function(){
+    let userManagerPromise = UserManager.fetchMe("u/me").then(function(){
         UserManager.addIsLoggedInListener(function (isLoggedIn) {
             if (isLoggedIn) {
                 const settingsManager = SettingsManager.getInstance();
@@ -4532,6 +4534,10 @@ InitPromise.addPromise(function(app){
             }
         });
     });
+
+    if (UserManager.waitForData){
+        return userManagerPromise;
+    }
 });
 
 class UserAction extends MenuAction {
@@ -7953,6 +7959,7 @@ SettingsSite.setTemplate("html/application/setting-template.html");
 
 RegistrationSite.addAction = false;
 LoginSite.addLoginAction = false;
+UserManager.waitForData = false;
 
 InitPromise.resolve(app$1).then(async function () {
     SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;
diff --git a/src/js/init.js b/src/js/init.js
index 8070da2..0072752 100755
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -9,7 +9,7 @@ import {
     Translator,
     WhatsappShareButton
 } from "./lib/pwa-lib";
-import {LoginSite, RegistrationSite} from "./lib/pwa-user-management";
+import {LoginSite, RegistrationSite, UserManager} from "./lib/pwa-user-management";
 
 import "./lib/pwa-lib"
 import "./lib/pwa-core"
@@ -69,6 +69,7 @@ SettingsSite.setTemplate("html/application/setting-template.html");
 
 RegistrationSite.addAction = false;
 LoginSite.addLoginAction = false;
+UserManager.waitForData = false;
 
 InitPromise.resolve(app).then(async function () {
     SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;
diff --git a/src/js/lib/pwa-user-management.js b/src/js/lib/pwa-user-management.js
index 349ba3c..5485355 100755
--- a/src/js/lib/pwa-user-management.js
+++ b/src/js/lib/pwa-user-management.js
@@ -72,10 +72,12 @@ class UserManager {
         return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id);
     }
 }
+UserManager.waitForData = true;
+
 
 InitPromise.addPromise(function(app){
     UserManager.init(app);
-    return UserManager.fetchMe("u/me").then(function(){
+    let userManagerPromise = UserManager.fetchMe("u/me").then(function(){
         UserManager.addIsLoggedInListener(function (isLoggedIn) {
             if (isLoggedIn) {
                 const settingsManager = SettingsManager.getInstance();
@@ -96,6 +98,10 @@ InitPromise.addPromise(function(app){
             }
         });
     });
+
+    if (UserManager.waitForData){
+        return userManagerPromise;
+    }
 });
 
 class UserAction extends MenuAction {