[android] Reuse Java Source objects by holding on to a strong reference in the C++ peer.

1 files changed, 6 insertions, 4 deletions

diff --git a/platform/android/src/style/sources/unknown_source.cpp b/platform/android/src/style/sources/unknown_source.cpp
index 79f27bdfbf..4b5510c1db 100644
--- a/platform/android/src/style/sources/unknown_source.cpp
+++ b/platform/android/src/style/sources/unknown_source.cpp
@@ -12,15 +12,17 @@ namespace {
 namespace mbgl {
 namespace android {
 
-    UnknownSource::UnknownSource(mbgl::style::Source& coreSource)
-            : Source(coreSource) {
+    UnknownSource::UnknownSource(jni::JNIEnv& env,
+                                 mbgl::style::Source& coreSource,
+                                 AndroidRendererFrontend& frontend)
+        : Source(env, coreSource, createJavaPeer(env), frontend) {
     }
 
     jni::Class<UnknownSource> UnknownSource::javaClass;
 
-    jni::jobject* UnknownSource::createJavaPeer(jni::JNIEnv& env) {
+    jni::Object<Source> UnknownSource::createJavaPeer(jni::JNIEnv& env) {
         static auto constructor = UnknownSource::javaClass.template GetConstructor<jni::jlong>(env);
-        return UnknownSource::javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
+        return jni::Object<Source>(UnknownSource::javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this)).Get());
     }
 
     void UnknownSource::registerNative(jni::JNIEnv& env) {