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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2018-10-12 14:44:36 +03:00 • committed by Aleksandr Zatsepin
parent 7d745ecfe5
commit c594e3110f
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1678,7 +1678,7 @@ Java_com_mapswithme_maps_Framework_nativeAuthenticateUser(JNIEnv * env, jclass,
GetPlatform().RunTask(Platform::Thread::Gui, [gListener, success]
{
auto e = jni::GetEnv();
static jmethodID const callback = jni::GetMethodID(e, gListener.get(), "onAuthorized", "(Z)V");
jmethodID const callback = jni::GetMethodID(e, gListener.get(), "onAuthorized", "(Z)V");
e->CallVoidMethod(gListener.get(), callback, success);
});
};
@ -1826,17 +1826,13 @@ Java_com_mapswithme_maps_Framework_nativeGetCurrentTipsApi(JNIEnv * env, jclass)
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeBindUser(JNIEnv * env, jclass, jobject listener)
{
std::shared_ptr<_jobject> gListener(env->NewGlobalRef(listener), [](jobject l)
{
jni::GetEnv()->DeleteGlobalRef(l);
});
auto listenerRef = jni::make_global_ref(listener);
auto & user = frm()->GetUser();
user.BindUser([gListener](bool success)
user.BindUser([listenerRef](bool success)
{
auto e = jni::GetEnv();
static jmethodID const callback = jni::GetMethodID(e, gListener.get(), "onUserBound", "(Z)V");
e->CallVoidMethod(gListener.get(), callback, static_cast<jboolean>(success));
jmethodID const callback = jni::GetMethodID(e, *listenerRef, "onUserBound", "(Z)V");
e->CallVoidMethod(*listenerRef, callback, static_cast<jboolean>(success));
});
}
} // extern "C"

3
android/src/com/mapswithme/util/HttpUploader.java
View file

@ -273,6 +273,9 @@ public final class HttpUploader
}
}
@NonNull
public static native String nativeUserBindingCertificate();
@NonNull
public static native String nativeUserBindingPassword();
}