From c82f4a4af3485011cf73c15d0397ddcc018e15b1 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:41:06 -0700 Subject: [PATCH 1/2] good prevails --- loader/src/platform/android/LoaderImpl.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/loader/src/platform/android/LoaderImpl.cpp b/loader/src/platform/android/LoaderImpl.cpp index 7d08f9ca..e55ecf08 100644 --- a/loader/src/platform/android/LoaderImpl.cpp +++ b/loader/src/platform/android/LoaderImpl.cpp @@ -41,8 +41,6 @@ bool Loader::Impl::supportsLaunchArguments() const { return true; } -#include - std::string Loader::Impl::getLaunchCommand() const { std::string launchArgs = ""; @@ -60,9 +58,6 @@ std::string Loader::Impl::getLaunchCommand() const { if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) == JNI_OK) { env->ExceptionClear(); } - - // note to self: remove this in about a week (02/11 maybe) - console::messageBox("Outdated launcher detected", "A very outdated version of the launcher is currently in use. Please update your launcher for the latest bugfixes and features.", Severity::Warning); } return launchArgs; From 90517798003b03838b271ae2aef278181a72bc92 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Tue, 13 Feb 2024 19:36:26 -0300 Subject: [PATCH 2/2] only give filename to android pickFile defaultPath --- loader/src/platform/android/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/src/platform/android/util.cpp b/loader/src/platform/android/util.cpp index 0ed2ac26..c9a674d5 100644 --- a/loader/src/platform/android/util.cpp +++ b/loader/src/platform/android/util.cpp @@ -217,7 +217,7 @@ void file::pickFile( JniMethodInfo t; if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", method.c_str(), "(Ljava/lang/String;)Z")) { - jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).string().c_str()); + jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).filename().string().c_str()); jboolean result = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);