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

[android] Fix crash in GetBatteryLevel()/GetBatteryLevel()

Browse source 
Follow up aa7ef4a189

Fixes #60
Fixes #81

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-01-07 00:36:03 +03:00
parent 37f39eec63
commit 669a604bb6
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/gradle.properties
View file

@ -2,8 +2,8 @@ propMinSdkVersion=21
propTargetSdkVersion=29
propCompileSdkVersion=29
propBuildToolsVersion=27.0.3
propVersionCode=1049
propVersionName=10.4.9
propVersionCode=1050
propVersionName=10.5.0
propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
propMultiDexVersion=2.0.1

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

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

@ -50,6 +50,12 @@ public final class BatteryState
return batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
}
@ChargingStatus
public static int getChargingStatus(@NonNull Context context)
{
return getState(context).getChargingStatus();
}
@ChargingStatus
private static int getChargingStatus(@NonNull Intent batteryStatus)
{