oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

android/Environment: pass JNIEnv to all functions

Browse Source
This commit is contained in:
Max Kellermann
2022-08-18 18:07:29 +02:00
parent 2efc1db6a9
commit 1f4df2a64d
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main.cxx
View File

@@ -591,12 +591,12 @@ MainConfigured(const CommandLineOptions &options,
#ifdef ANDROID
static void
AndroidMain()
AndroidMain(JNIEnv *env)
{
CommandLineOptions options;
ConfigData raw_config;
const auto sdcard = Environment::getExternalStorageDirectory();
const auto sdcard = Environment::getExternalStorageDirectory(env);
if (!sdcard.IsNull()) {
const auto config_path =
sdcard / Path::FromFS("mpd.conf");
@@ -625,7 +625,7 @@ Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logL
AtScopeExit() { delete logListener; };
try {
AndroidMain();
AndroidMain(env);
} catch (...) {
LogError(std::current_exception());
}