[android] - harden activation/deactivation of underlying ref counting components

4 files changed, 162 insertions, 7 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 1997375f9e..0a2ece7378 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -96,6 +96,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
   private MapKeyListener mapKeyListener;
   private MapZoomButtonController mapZoomButtonController;
   private Bundle savedInstanceState;
+  private boolean isActivated;
 
   @UiThread
   public MapView(@NonNull Context context) {
@@ -371,8 +372,11 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    */
   @UiThread
   public void onStart() {
-    ConnectivityReceiver.instance(getContext()).activate();
-    FileSource.getInstance(getContext()).activate();
+    if (!isActivated) {
+      ConnectivityReceiver.instance(getContext()).activate();
+      FileSource.getInstance(getContext()).activate();
+      isActivated = true;
+    }
     if (mapboxMap != null) {
       mapboxMap.onStart();
     }
@@ -417,8 +421,11 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
       mapRenderer.onStop();
     }
 
-    ConnectivityReceiver.instance(getContext()).deactivate();
-    FileSource.getInstance(getContext()).deactivate();
+    if (isActivated) {
+      ConnectivityReceiver.instance(getContext()).deactivate();
+      FileSource.getInstance(getContext()).deactivate();
+      isActivated = false;
+    }
   }
 
   /**
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/RecyclerViewActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/RecyclerViewActivity.kt
new file mode 100644
index 0000000000..7dbac1e7a7
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/RecyclerViewActivity.kt
@@ -0,0 +1,148 @@
+package com.mapbox.mapboxsdk.testapp.activity.maplayout
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.TextView
+import com.mapbox.mapboxsdk.maps.MapView
+import com.mapbox.mapboxsdk.testapp.R
+import kotlinx.android.synthetic.main.activity_recyclerview.*
+
+/**
+ * TestActivity showcasing how to integrate a MapView in a RecyclerView.
+ * <p>
+ * It requires calling the correct lifecycle methods when detaching and attaching the View to
+ * the RecyclerView with onViewAttachedToWindow and onViewDetachedFromWindow.
+ * </p>
+ */
+@SuppressLint("ClickableViewAccessibility")
+class RecyclerViewActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_recyclerview)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.adapter = ItemAdapter(LayoutInflater.from(this), savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle?) {
+        super.onSaveInstanceState(outState)
+        // to save state, we need to call MapView#onSaveInstanceState
+        (recyclerView.adapter as ItemAdapter).onSaveInstanceState(outState)
+    }
+
+    override fun onLowMemory() {gi
+        super.onLowMemory()
+        // to release memory, we need to call MapView#onLowMemory
+        (recyclerView.adapter as ItemAdapter).onLowMemory()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // to perform cleanup, we need to call MapView#onDestroy
+        (recyclerView.adapter as ItemAdapter).onDestroy()
+    }
+
+    class ItemAdapter(private val inflater: LayoutInflater, val savedInstanceState: Bundle?) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+        private val items = listOf(
+                "one", "two", "three", MapItem(), "four", "five", "six", "seven", "eight", "nine", "ten",
+                "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen",
+                "nineteen", "twenty", "twenty-one"
+        )
+
+        private var mapHolder: MapHolder? = null
+
+        companion object {
+            const val TYPE_MAP = 0
+            const val TYPE_TEXT = 1
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+            return if (viewType == TYPE_MAP) {
+                val mapView = inflater.inflate(R.layout.item_map, parent, false) as MapView
+                mapHolder = MapHolder(mapView, savedInstanceState)
+                return mapHolder as MapHolder
+            } else {
+                TextHolder(inflater.inflate(android.R.layout.simple_list_item_1, parent, false) as TextView)
+            }
+        }
+
+        override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
+            super.onViewAttachedToWindow(holder)
+            if (holder is MapHolder) {
+                val mapView = holder.mapView
+                mapView.onStart()
+                mapView.onResume()
+            }
+        }
+
+        override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
+            super.onViewDetachedFromWindow(holder)
+            if (holder is MapHolder) {
+                val mapView = holder.mapView
+                mapView.onPause()
+                mapView.onStop()
+            }
+        }
+
+        override fun getItemCount(): Int {
+            return items.count()
+        }
+
+        override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+            if (holder.itemViewType == TYPE_TEXT) {
+                val textHolder = holder as TextHolder
+                textHolder.bind(items[position] as String)
+            }
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return if (items[position] is MapItem) {
+                TYPE_MAP
+            } else {
+                TYPE_TEXT
+            }
+        }
+
+        fun onSaveInstanceState(savedInstanceState: Bundle?){
+            savedInstanceState?.let {
+                mapHolder?.mapView?.onSaveInstanceState(it)
+            }
+        }
+
+        fun onLowMemory() {
+            mapHolder?.mapView?.onLowMemory()
+        }
+
+        fun onDestroy() {
+            mapHolder?.mapView?.let {
+                it.onPause()
+                it.onStop()
+                it.onDestroy()
+            }
+        }
+
+        class MapItem
+        class MapHolder(val mapView: MapView, bundle: Bundle?) : RecyclerView.ViewHolder(mapView) {
+            init {
+                mapView.onCreate(bundle)
+                mapView.setOnTouchListener { view, motionEvent ->
+                    // Disallow the touch request for recyclerView scroll
+                    view.parent.requestDisallowInterceptTouchEvent(true)
+                    mapView.onTouchEvent(motionEvent)
+                    true
+                }
+            }
+        }
+        class TextHolder(val textView: TextView) : RecyclerView.ViewHolder(textView) {
+            fun bind(item: String) {
+                textView.text = item
+            }
+        }
+    }
+}
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 86e4f4f5f8..2af9abac6c 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath dependenciesList.licensesPlugin
         classpath dependenciesList.kotlinPlugin
     }
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index 84af82d181..9a7d4d7d27 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 14 12:12:39 CEST 2018
+#Wed Dec 19 09:48:04 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip