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

[android] Review fixes

Browse source
This commit is contained in:
Roman Romanov 2017-04-13 16:23:14 +04:00
parent de60c53326
commit 424418dd7e
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/core/jni_helper.cpp
View file

@ -198,8 +198,7 @@ bool HandleJavaException(JNIEnv * env)
const jthrowable e = env->ExceptionOccurred();
env->ExceptionDescribe();
env->ExceptionClear();
//LOG(LERROR, (ToNativeString(env, e)));
LOG(LWARNING, (ToNativeString(env, e)));
LOG(LERROR, (ToNativeString(env, e)));
return true;
}
return false;

11
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -554,7 +554,11 @@ uber::RideRequestLinks Framework::GetUberLinks(string const & productId, ms::Lat
return uber::Api::GetRideRequestLinks(productId, from, to);
}
int Framework::ToDoAfterUpdate() const { return (int)m_work.ToDoAfterUpdate(); }
int Framework::ToDoAfterUpdate() const
{
return (int) m_work.ToDoAfterUpdate();
}
} // namespace android
//============ GLUE CODE for com.mapswithme.maps.Framework class =============//
@ -755,9 +759,10 @@ JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass)
{
vector<Country const *> countries;
vector<string> ids;
class Storage const & storage = g_framework->GetStorage();
Storage const & storage = g_framework->GetStorage();
storage.GetOutdatedCountries(countries);
vector<string> ids;
for (auto country : countries)
ids.push_back(country->Name());

1
android/src/com/mapswithme/maps/Framework.java
View file

@ -153,6 +153,7 @@ public class Framework
@NonNull
public static native String[] nativeGetOutdatedCountries();
@UiThread
@DoAfterUpdate
public static native int nativeToDoAfterUpdate();