refactor: Un-singletonize Paths & Updates (#5092)

src/common/Credentials.cpp

@@ -1,5 +1,6 @@
 #include "common/Credentials.hpp"
 
+#include "Application.hpp"
 #include "debug/AssertInGuiThread.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
@@ -40,7 +41,7 @@ bool useKeyring()
 #ifdef NO_QTKEYCHAIN
     return false;
 #endif
-    if (getPaths()->isPortable())
+    if (getIApp()->getPaths().isPortable())
     {
         return false;
     }
@@ -55,7 +56,8 @@ bool useKeyring()
 // Insecure storage:
 QString insecurePath()
 {
-    return combinePath(getPaths()->settingsDirectory, "credentials.json");
+    return combinePath(getIApp()->getPaths().settingsDirectory,
+                       "credentials.json");
 }
 
 QJsonDocument loadInsecure()