1 files changed, 3 insertions, 16 deletions

diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 381b41fab5..ebbaa9f5f5 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -856,8 +856,7 @@ jni::Array<jni::Object<Source>> NativeMapView::getSources(JNIEnv& env) {
     jni::Array<jni::Object<Source>> jSources = jni::Array<jni::Object<Source>>::New(env, sources.size(), Source::javaClass);
     int index = 0;
     for (auto source : sources) {
-        auto jSource = jni::Object<Source>(createJavaSourcePeer(env, *rendererFrontend, *source));
-        jSources.Set(env, index, jSource);
+        jSources.Set(env, index, Source::peerForCoreSource(env, *rendererFrontend, *source));
         index++;
     }
 
@@ -872,8 +871,7 @@ jni::Object<Source> NativeMapView::getSource(JNIEnv& env, jni::String sourceId)
        return jni::Object<Source>();
     }
 
-    // Create and return the source's native peer
-    return jni::Object<Source>(createJavaSourcePeer(env, *rendererFrontend, *coreSource));
+    return Source::peerForCoreSource(env, *rendererFrontend, *coreSource);
 }
 
 void NativeMapView::addSource(JNIEnv& env, jni::Object<Source> obj, jlong sourcePtr) {
@@ -881,22 +879,12 @@ void NativeMapView::addSource(JNIEnv& env, jni::Object<Source> obj, jlong source
 
     Source *source = reinterpret_cast<Source *>(sourcePtr);
     try {
-        source->addToMap(env, obj, *map);
-        source->setRendererFrontend(*rendererFrontend);
+        source->addToMap(env, obj, *map, *rendererFrontend);
     } catch (const std::runtime_error& error) {
         jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
     }
 }
 
-jni::Object<Source> NativeMapView::removeSourceById(JNIEnv& env, jni::String id) {
-    std::unique_ptr<mbgl::style::Source> coreSource = map->getStyle().removeSource(jni::Make<std::string>(env, id));
-    if (coreSource) {
-        return jni::Object<Source>(removeSourceFromMap(std::move(coreSource)));
-    } else {
-        return jni::Object<Source>();
-    }
-}
-
 void NativeMapView::removeSource(JNIEnv& env, jni::Object<Source> obj, jlong sourcePtr) {
     assert(sourcePtr != 0);
 
@@ -1044,7 +1032,6 @@ void NativeMapView::registerNative(jni::JNIEnv& env) {
             METHOD(&NativeMapView::getSources, "nativeGetSources"),
             METHOD(&NativeMapView::getSource, "nativeGetSource"),
             METHOD(&NativeMapView::addSource, "nativeAddSource"),
-            METHOD(&NativeMapView::removeSourceById, "nativeRemoveSourceById"),
             METHOD(&NativeMapView::removeSource, "nativeRemoveSource"),
             METHOD(&NativeMapView::addImage, "nativeAddImage"),
             METHOD(&NativeMapView::addImages, "nativeAddImages"),