refactor: remove per-app darkmode vestiges

Dark mode being saved in localstorage per-application doesn't make much
sense and is different to the ui_defaults options. It's far better to
save dark mode gobally.

In a previous commit, we did that. After doing so, this code is obsolete

Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Ic00bf2d7a7ad58bfdcf3f7375bebfafe62a75686

6 files changed, 11 insertions, 75 deletions

diff --git a/browser/js/global.js b/browser/js/global.js
index 5f68941aad..f33f28083c 100644
--- a/browser/js/global.js
+++ b/browser/js/global.js
@@ -1330,14 +1330,9 @@ window.app = {
 				if (spellOnline) {
 					msg += ' spellOnline=' + spellOnline;
 				}
-				var docTypes = ['text', 'spreadsheet', 'presentation', 'drawing'];
+
 				const darkTheme = window.prefs.getBoolean('darkTheme');
-				for (var i = 0; i < docTypes.length; ++i) {
-					var docType = docTypes[i];
-					if (darkTheme) {
-						msg += ' ' + docType + 'DarkTheme=' + darkTheme;
-					}
-				}
+				msg += ' darkTheme=' + darkTheme;
 
 				msg += ' timezone=' + Intl.DateTimeFormat().resolvedOptions().timeZone;
 
diff --git a/browser/src/core/Socket.js b/browser/src/core/Socket.js
index 1eb5877d73..f16d4acfa7 100644
--- a/browser/src/core/Socket.js
+++ b/browser/src/core/Socket.js
@@ -246,14 +246,9 @@ app.definitions.Socket = L.Class.extend({
 		if (spellOnline) {
 			msg += ' spellOnline=' + spellOnline;
 		}
-		var docTypes = ['text', 'spreadsheet', 'presentation', 'drawing'];
+
 		const darkTheme = window.prefs.getBoolean('darkTheme');
-		for (var i = 0; i < docTypes.length; ++i) {
-			var docType = docTypes[i];
-			if (darkTheme) {
-				msg += ' ' + docType + 'DarkTheme=' + darkTheme;
-			}
-		}
+		msg += ' darkTheme=' + darkTheme;
 
 		var accessibilityState = window.prefs.getBoolean('accessibilityState');
 		accessibilityState = accessibilityState || L.Browser.cypressTest;
diff --git a/common/Session.cpp b/common/Session.cpp
index 6ba9c3a7c0..3195c8ed8d 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -195,24 +195,9 @@ void Session::parseDocOptions(const StringVector& tokens, int& part, std::string
             _spellOnline = value;
             ++offset;
         }
-        else if (name == "textDarkTheme")
+        else if (name == "darkTheme")
         {
-            _textDarkTheme = value;
-            ++offset;
-        }
-        else if (name == "spreadsheetDarkTheme")
-        {
-            _spreadsheetDarkTheme = value;
-            ++offset;
-        }
-        else if (name == "presentationDarkTheme")
-        {
-            _presentationDarkTheme = value;
-            ++offset;
-        }
-        else if (name == "drawingDarkTheme")
-        {
-            _drawingDarkTheme = value;
+            _darkTheme = value;
             ++offset;
         }
         else if (name == "batch")
diff --git a/common/Session.hpp b/common/Session.hpp
index eb3ea47f57..1e7a06806c 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -253,10 +253,7 @@ public:
 
     const std::string& getSpellOnline() const { return _spellOnline; }
 
-    const std::string& getTextDarkTheme() const { return _textDarkTheme; }
-    const std::string& getSpreadsheetDarkTheme() const { return _spreadsheetDarkTheme; }
-    const std::string& getPresentationDarkTheme() const { return _presentationDarkTheme; }
-    const std::string& getDrawingDarkTheme() const { return _drawingDarkTheme; }
+    const std::string& getDarkTheme() const { return _darkTheme; }
 
     const std::string& getBatchMode() const { return _batch; }
 
@@ -375,10 +372,7 @@ private:
     std::string _spellOnline;
 
     /// The start value for Dark Theme whether it is active or not on start.
-    std::string _textDarkTheme;
-    std::string _spreadsheetDarkTheme;
-    std::string _presentationDarkTheme;
-    std::string _drawingDarkTheme;
+    std::string _darkTheme;
 
     /// Disable dialogs interactivity.
     std::string _batch;
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 2054c2d4c2..48da27fb6b 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1724,25 +1724,7 @@ std::map<std::string, int> Document::getViewColors()
 
 std::string Document::getDefaultTheme(const std::shared_ptr<ChildSession>& session) const
 {
-    bool darkTheme;
-    switch (_loKitDocument->getDocumentType())
-    {
-    case LOK_DOCTYPE_TEXT:
-        darkTheme = session->getTextDarkTheme() == "true";
-        break;
-    case LOK_DOCTYPE_SPREADSHEET:
-        darkTheme = session->getSpreadsheetDarkTheme() == "true";
-        break;
-    case LOK_DOCTYPE_PRESENTATION:
-        darkTheme = session->getPresentationDarkTheme() == "true";
-        break;
-    case LOK_DOCTYPE_DRAWING:
-        darkTheme = session->getDrawingDarkTheme() == "true";
-        break;
-    default:
-        darkTheme = false;
-        break;
-    }
+    bool darkTheme = session->getDarkTheme() == "true";
     return darkTheme ? "Dark" : "Light";
 }
 
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ddc8243340..2faa0337cf 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1257,24 +1257,9 @@ bool ClientSession::loadDocument(const char* /*buffer*/, int /*length*/,
             oss << " spellOnline=" << getSpellOnline();
         }
 
-        if (!getTextDarkTheme().empty())
+        if (!getDarkTheme().empty())
         {
-            oss << " textDarkTheme=" << getTextDarkTheme();
-        }
-
-        if (!getSpreadsheetDarkTheme().empty())
-        {
-            oss << " spreadsheetDarkTheme=" << getSpreadsheetDarkTheme();
-        }
-
-        if (!getPresentationDarkTheme().empty())
-        {
-            oss << " presentationDarkTheme=" << getPresentationDarkTheme();
-        }
-
-        if (!getDrawingDarkTheme().empty())
-        {
-            oss << " drawingDarkTheme=" << getDrawingDarkTheme();
+            oss << " darkTheme=" << getDarkTheme();
         }
 
         if (!getWatermarkText().empty())