gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fix for lost jni signature refactoring

Browse source
This commit is contained in:
Alexey Osminin 2021-01-12 13:33:34 +03:00 • committed by Aleksandr Zatsepin
parent 7e879a37ca
commit 1825dc3c18
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -127,9 +127,10 @@ Platform::ChargingStatus Platform::GetChargingStatus()
ASSERT(clazzBatteryState, ());
static jmethodID const getChargingMethodId =
jni::GetStaticMethodID(env, clazzBatteryState, "getChargingStatus", "()I");
jni::GetStaticMethodID(env, clazzBatteryState, "getChargingStatus", "(Landroid/content/Context;)I");
jobject context = android::Platform::Instance().GetContext();
return static_cast<Platform::ChargingStatus>(
env->CallStaticIntMethod(clazzBatteryState, getChargingMethodId));
env->CallStaticIntMethod(clazzBatteryState, getChargingMethodId, context));
}
uint8_t Platform::GetBatteryLevel()
@ -143,9 +144,9 @@ uint8_t Platform::GetBatteryLevel()
ASSERT(clazzBatteryState, ());
static auto const getLevelMethodId =
jni::GetStaticMethodID(env, clazzBatteryState, "getLevel", "()I");
return static_cast<uint8_t>(env->CallStaticIntMethod(clazzBatteryState, getLevelMethodId));
jni::GetStaticMethodID(env, clazzBatteryState, "getLevel", "(Landroid/content/Context;)I");
jobject context = android::Platform::Instance().GetContext();
return static_cast<uint8_t>(env->CallStaticIntMethod(clazzBatteryState, getLevelMethodId, context));
}
namespace platform

10
android/src/com/mapswithme/util/BatteryState.java
View file

@ -38,6 +38,8 @@ public final class BatteryState
return new State(getLevel(batteryStatus), getChargingStatus(batteryStatus));
}
// Called from JNI.
@SuppressWarnings("unused")
@IntRange(from=0, to=100)
public static int getLevel(@NonNull Context context)
{
@ -50,6 +52,14 @@ public final class BatteryState
return batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
}
// Called from JNI.
@SuppressWarnings("unused")
@ChargingStatus
public static int getChargingStatus(@NonNull Context context)
{
return getState(context).getChargingStatus();
}
@ChargingStatus
private static int getChargingStatus(@NonNull Intent batteryStatus)
{