From d0eeb1bbe7a705cf0cf95f1fbddb4a52863f07fd Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Wed, 24 Apr 2024 15:19:04 +0100
Subject: [PATCH] Rebranded log filenames citra_log.txt --> lime3ds_log.txt
 citra_log.txt.old.txt --> lime3ds_log.old.txt

---
 .../github/lime3ds/android/fragments/HomeSettingsFragment.kt  | 4 ++--
 .../java/io/github/lime3ds/android/utils/DocumentsTree.kt     | 2 +-
 src/common/common_paths.h                                     | 2 +-
 src/common/logging/backend.cpp                                | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
index 1f538db87..122f0b05a 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
@@ -201,8 +201,8 @@ class HomeSettingsFragment : Fragment() {
             requireContext(),
             PermissionsHandler.citraDirectory
         )?.findFile("log")
-        val currentLog = logDirectory?.findFile("citra_log.txt")
-        val oldLog = logDirectory?.findFile("citra_log.txt.old.txt")
+        val currentLog = logDirectory?.findFile("lime3ds_log.txt")
+        val oldLog = logDirectory?.findFile("lime3ds_log.old.txt")
 
         val intent = Intent().apply {
             action = Intent.ACTION_SEND
diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
index 915fb0480..4846806cd 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
@@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap
  * A cached document tree for Citra user directory.
  * For every filepath which is not startsWith "content://" will need to use this class to traverse.
  * For example:
- * C++ Citra log file directory will be /log/citra_log.txt.
+ * C++ Lime3DS log file directory will be /log/lime3ds_log.txt.
  * After DocumentsTree.resolvePath() it will become content URI.
  */
 class DocumentsTree {
diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index f12eedb0c..022ba5c5b 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -55,7 +55,7 @@
 
 // Filenames
 // Files in the directory returned by GetUserPath(UserPath::LogDir)
-#define LOG_FILE "citra_log.txt"
+#define LOG_FILE "lime3ds_log.txt"
 
 // Files in the directory returned by GetUserPath(UserPath::ConfigDir)
 #define EMU_CONFIG "emu.ini"
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index b33462472..3c75ba597 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -13,6 +13,7 @@
 #define _SH_DENYWR 0
 #endif
 
+#include <boost/algorithm/string/replace.hpp>
 #ifdef CITRA_LINUX_GCC_BACKTRACE
 #define BOOST_STACKTRACE_USE_BACKTRACE
 #include <boost/stacktrace.hpp>
@@ -89,7 +90,7 @@ class FileBackend final : public Backend {
 public:
     explicit FileBackend(const std::string& filename) {
         auto old_filename = filename;
-        old_filename += ".old.txt";
+        boost::replace_all(old_filename, ".txt", ".old.txt");
 
         // Existence checks are done within the functions themselves.
         // We don't particularly care if these succeed or not.