add the logcat writer

geode-sdk · Oct 15, 2023 · 57a475b · 57a475b
1 parent cd012df
commit 57a475b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/loader/src/internal/crashlog.cpp b/loader/src/internal/crashlog.cpp
@@ -3,7 +3,7 @@
 
 using namespace geode::prelude;
 
-static std::string getDateString(bool filesafe) {
+std::string crashlog::getDateString(bool filesafe) {
     auto const now = std::time(nullptr);
     auto const tm = *std::localtime(&now);
     std::ostringstream oss;

diff --git a/loader/src/internal/crashlog.hpp b/loader/src/internal/crashlog.hpp
@@ -26,4 +26,6 @@ namespace crashlog {
     ghc::filesystem::path GEODE_DLL getCrashLogDirectory();
 
     std::string GEODE_DLL writeCrashlog(geode::Mod* faultyMod, std::string const& info, std::string const& stacktrace, std::string const& registers);
+
+    std::string getDateString(bool filesafe);
 }
diff --git a/loader/src/platform/android/crashlog.cpp b/loader/src/platform/android/crashlog.cpp
@@ -15,6 +15,10 @@ using namespace geode::prelude;
 #include <link.h>
 #include <unwind.h>
 
+
+#include <jni.h>
+#include <Geode/cocos/platform/android/jni/JniHelper.h>
+
 #include "backtrace/execinfo.hpp"
 
 static constexpr size_t FRAME_SIZE = 64;
@@ -413,6 +417,19 @@ ghc::filesystem::path crashlog::getCrashLogDirectory() {
 }
 
 bool crashlog::setupPlatformHandler() {
+    auto path = crashlog::getCrashLogDirectory() / (getDateString(true) + ".log");
+
+    JniMethodInfo t;
+    if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", "writeLogcatCrashBuffer", "(Ljava/lang/String;)Z")) {
+        jstring stringArg1 = t.env->NewStringUTF(path.string().c_str());
+
+        jboolean result = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);
+
+        t.env->DeleteLocalRef(stringArg1);
+        t.env->DeleteLocalRef(t.classID);
+        return result;
+    }
+
     return false;
 }