VERY experimental Nintendo Switch 2 emulator
C++
android: Adjust log lifecycle
Charles Lombardo5611471909f2
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex f37875ffea..da98d4ef50 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -47,6 +47,7 @@ import org.yuzu.yuzu_emu.model.EmulationViewModelimport org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.ForegroundServiceimport org.yuzu.yuzu_emu.utils.InputHandler+import org.yuzu.yuzu_emu.utils.Logimport org.yuzu.yuzu_emu.utils.MemoryUtilimport org.yuzu.yuzu_emu.utils.NfcReaderimport org.yuzu.yuzu_emu.utils.ThemeHelper@@ -80,6 +81,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {}override fun onCreate(savedInstanceState: Bundle?) {+ Log.gameLaunched = trueThemeHelper.setTheme(this)super.onCreate(savedInstanceState)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.ktindex 6e19fc6c0c..8ed4b482e4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt@@ -42,6 +42,7 @@ import org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.ui.main.MainActivityimport org.yuzu.yuzu_emu.utils.FileUtilimport org.yuzu.yuzu_emu.utils.GpuDriverHelper+import org.yuzu.yuzu_emu.utils.Logclass HomeSettingsFragment : Fragment() {private var _binding: FragmentHomeSettingsBinding? = null@@ -312,19 +313,32 @@ class HomeSettingsFragment : Fragment() {}}+ // Share the current log if we just returned from a game but share the old log+ // if we just started the app and the old log exists.private fun shareLog() {- val file = DocumentFile.fromSingleUri(+ val currentLog = DocumentFile.fromSingleUri(mainActivity,DocumentsContract.buildDocumentUri(DocumentProvider.AUTHORITY,"${DocumentProvider.ROOT_ID}/log/yuzu_log.txt"))!!- if (file.exists()) {- val intent = Intent(Intent.ACTION_SEND)- .setDataAndType(file.uri, FileUtil.TEXT_PLAIN)- .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)- .putExtra(Intent.EXTRA_STREAM, file.uri)+ val oldLog = DocumentFile.fromSingleUri(+ mainActivity,+ DocumentsContract.buildDocumentUri(+ DocumentProvider.AUTHORITY,+ "${DocumentProvider.ROOT_ID}/log/yuzu_log.txt.old.txt"+ )+ )!!++ val intent = Intent(Intent.ACTION_SEND)+ .setDataAndType(currentLog.uri, FileUtil.TEXT_PLAIN)+ .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)+ if (!Log.gameLaunched && oldLog.exists()) {+ intent.putExtra(Intent.EXTRA_STREAM, oldLog.uri)+ startActivity(Intent.createChooser(intent, getText(R.string.share_log)))+ } else if (currentLog.exists()) {+ intent.putExtra(Intent.EXTRA_STREAM, currentLog.uri)startActivity(Intent.createChooser(intent, getText(R.string.share_log)))} else {Toast.makeText(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.ktindex 1d3c7dce36..fb682c3446 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt@@ -4,6 +4,9 @@package org.yuzu.yuzu_emu.utilsobject Log {+ // Tracks whether we should share the old log or the current log+ var gameLaunched = false+external fun debug(message: String)external fun warning(message: String)diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cppindex 0e458df38d..294e41045c 100644--- a/src/android/app/src/main/jni/native.cpp+++ b/src/android/app/src/main/jni/native.cpp@@ -248,6 +248,11 @@ void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath)}void EmulationSession::InitializeSystem() {+ // Initialize logging system+ Common::Log::Initialize();+ Common::Log::SetColorConsoleBackendEnabled(true);+ Common::Log::Start();+// Initialize filesystem.m_system.SetFilesystem(m_vfs);m_system.GetUserChannel().clear();@@ -462,10 +467,6 @@ void EmulationSession::OnEmulationStopped(Core::SystemResultStatus result) {}static Core::SystemResultStatus RunEmulation(const std::string& filepath) {- Common::Log::Initialize();- Common::Log::SetColorConsoleBackendEnabled(true);- Common::Log::Start();-MicroProfileOnThreadCreate("EmuThread");SCOPE_EXIT({ MicroProfileShutdown(); });