[android] #3900 - Using CopyWriteArrayList to avoid concurrency issues with MapChangeListeners

1 files changed, 13 insertions, 13 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java
index 411ca36316..1f30a4f0ea 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java
@@ -39,25 +39,13 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ActionBar actionBar = getSupportActionBar();
+        final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        ArrayAdapter<CharSequence> locationTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_tracking_mode, android.R.layout.simple_spinner_item);
-        locationTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mLocationSpinner = (Spinner) findViewById(R.id.spinner_location);
-        mLocationSpinner.setAdapter(locationTrackingAdapter);
-        mLocationSpinner.setOnItemSelectedListener(this);
-
-        ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
-        bearingTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mBearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
-        mBearingSpinner.setAdapter(bearingTrackingAdapter);
-        mBearingSpinner.setOnItemSelectedListener(this);
-
         mMapView = (MapView) findViewById(R.id.mapView);
         mMapView.setAccessToken(ApiAccess.getToken(this));
         mMapView.onCreate(savedInstanceState);
@@ -68,6 +56,18 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
 
                 mapboxMap.setOnMyLocationChangeListener(MyLocationTrackingModeActivity.this);
 
+                ArrayAdapter<CharSequence> locationTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_tracking_mode, android.R.layout.simple_spinner_item);
+                locationTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+                mLocationSpinner = (Spinner) findViewById(R.id.spinner_location);
+                mLocationSpinner.setAdapter(locationTrackingAdapter);
+                mLocationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+
+                ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
+                bearingTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+                mBearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
+                mBearingSpinner.setAdapter(bearingTrackingAdapter);
+                mBearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+
                 try {
                     mapboxMap.setMyLocationEnabled(true);
                 } catch (SecurityException e) {