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

android/Environment: no namespace indent

This commit is contained in:
Max Kellermann 2022-08-18 18:07:47 +02:00
parent e2d4654e20
commit 2efc1db6a9
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/android/Environment.cxx
View File

@ -25,13 +25,13 @@
#include "fs/AllocatedPath.hxx"
namespace Environment {
static Java::TrivialClass cls;
static jmethodID getExternalStorageDirectory_method;
static jmethodID getExternalStoragePublicDirectory_method;
}
static Java::TrivialClass cls;
static jmethodID getExternalStorageDirectory_method;
static jmethodID getExternalStoragePublicDirectory_method;
void
Environment::Initialise(JNIEnv *env) noexcept
Initialise(JNIEnv *env) noexcept
{
cls.Find(env, "android/os/Environment");
@ -45,13 +45,13 @@ Environment::Initialise(JNIEnv *env) noexcept
}
void
Environment::Deinitialise(JNIEnv *env) noexcept
Deinitialise(JNIEnv *env) noexcept
{
cls.Clear(env);
}
AllocatedPath
Environment::getExternalStorageDirectory() noexcept
getExternalStorageDirectory() noexcept
{
JNIEnv *env = Java::GetEnv();
@ -65,7 +65,7 @@ Environment::getExternalStorageDirectory() noexcept
}
AllocatedPath
Environment::getExternalStoragePublicDirectory(const char *type) noexcept
getExternalStoragePublicDirectory(const char *type) noexcept
{
if (getExternalStoragePublicDirectory_method == nullptr)
/* needs API level 8 */
@ -74,11 +74,13 @@ Environment::getExternalStoragePublicDirectory(const char *type) noexcept
JNIEnv *env = Java::GetEnv();
Java::String type2(env, type);
jobject file = env->CallStaticObjectMethod(Environment::cls,
Environment::getExternalStoragePublicDirectory_method,
jobject file = env->CallStaticObjectMethod(cls,
getExternalStoragePublicDirectory_method,
type2.Get());
if (file == nullptr)
return nullptr;
return Java::File::ToAbsolutePath(env, file);
}
} // namespace Environment

32
src/android/Environment.hxx
View File

@ -17,27 +17,29 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_ANDROID_ENVIRONMENT_HXX
#define MPD_ANDROID_ENVIRONMENT_HXX
#include "util/Compiler.h"
#pragma once
#include <jni.h>
class AllocatedPath;
namespace Environment {
void Initialise(JNIEnv *env) noexcept;
void Deinitialise(JNIEnv *env) noexcept;
/**
* Determine the mount point of the external SD card.
*/
[[gnu::pure]]
AllocatedPath getExternalStorageDirectory() noexcept;
void
Initialise(JNIEnv *env) noexcept;
[[gnu::pure]]
AllocatedPath getExternalStoragePublicDirectory(const char *type) noexcept;
}
void
Deinitialise(JNIEnv *env) noexcept;
#endif
/**
* Determine the mount point of the external SD card.
*/
[[gnu::pure]]
AllocatedPath
getExternalStorageDirectory() noexcept;
[[gnu::pure]]
AllocatedPath
getExternalStoragePublicDirectory(const char *type) noexcept;
} // namespace Environment