From 191cc4116a2698904fa80dde3227cbd7efed7291 Mon Sep 17 00:00:00 2001 From: Abandoned Cart Date: Sat, 13 May 2023 08:12:34 -0400 Subject: [PATCH] Save log files with the `.log` file extension --- .gitignore | 3 --- app/src/main/cpp/emu_jni.cpp | 4 ++-- app/src/main/java/emu/skyline/MainActivity.kt | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cf0f2f6f..8ef3e541 100644 --- a/.gitignore +++ b/.gitignore @@ -101,9 +101,6 @@ lint/reports/ # Adreno Validation Layer libVkLayer_adreno.so -# Skyline logs -*.sklog - # Android Studio Profiler Traces *.trace diff --git a/app/src/main/cpp/emu_jni.cpp b/app/src/main/cpp/emu_jni.cpp index 516f69cc..2a249438 100644 --- a/app/src/main/cpp/emu_jni.cpp +++ b/app/src/main/cpp/emu_jni.cpp @@ -62,7 +62,7 @@ extern "C" JNIEXPORT void Java_emu_skyline_SkylineApplication_initializeLog( ) { skyline::JniString publicAppFilesPath(env, publicAppFilesPathJstring); skyline::Logger::configLevel = static_cast(logLevel); - skyline::Logger::LoaderContext.Initialize(publicAppFilesPath + "logs/loader.sklog"); + skyline::Logger::LoaderContext.Initialize(publicAppFilesPath + "logs/loader.log"); } extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication( @@ -88,7 +88,7 @@ extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication( std::shared_ptr settings{std::make_shared(env, settingsInstance)}; skyline::JniString publicAppFilesPath(env, publicAppFilesPathJstring); - skyline::Logger::EmulationContext.Initialize(publicAppFilesPath + "logs/emulation.sklog"); + skyline::Logger::EmulationContext.Initialize(publicAppFilesPath + "logs/emulation.log"); auto start{std::chrono::steady_clock::now()}; diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt index 3793336e..4f3789f7 100644 --- a/app/src/main/java/emu/skyline/MainActivity.kt +++ b/app/src/main/java/emu/skyline/MainActivity.kt @@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity() { binding.searchBar.apply { binding.logIcon.setOnClickListener { - val file = DocumentFile.fromSingleUri(this@MainActivity, DocumentsContract.buildDocumentUri(DocumentsProvider.AUTHORITY, "${DocumentsProvider.ROOT_ID}/logs/emulation.sklog"))!! + val file = DocumentFile.fromSingleUri(this@MainActivity, DocumentsContract.buildDocumentUri(DocumentsProvider.AUTHORITY, "${DocumentsProvider.ROOT_ID}/logs/emulation.log"))!! if (file.exists() && file.length() != 0L) { val intent = Intent(Intent.ACTION_SEND) .setDataAndType(file.uri, "text/plain")