Merge pull request #6904 from grzesiek2010/COLLECT-6882

Merge changes from v2025.1.4

Author: grzesiek2010

geo/src/main/java/org/odk/collect/geo/geopoly/GeoPolyActivity.java

@@ -15,6 +15,7 @@
 package org.odk.collect.geo.geopoly;
 
 import static org.odk.collect.geo.Constants.EXTRA_READ_ONLY;
+import static org.odk.collect.geo.Constants.EXTRA_RETAIN_MOCK_ACCURACY;
 import static org.odk.collect.geo.GeoActivityUtils.requireLocationPermissions;
 
 import android.content.Intent;
@@ -303,6 +304,7 @@ public void initMap(MapFragment newMapFragment) {
         map.setLongPressListener(this::onClick);
         map.setGpsLocationEnabled(true);
         map.setGpsLocationListener(this::onGpsLocation);
+        map.setRetainMockAccuracy(intent.getBooleanExtra(EXTRA_RETAIN_MOCK_ACCURACY, false));
 
         if (!map.hasCenter()) {
             if (!points.isEmpty()) {

geo/src/test/java/org/odk/collect/geo/geopoint/GeoPointMapActivityTest.java

@@ -157,7 +157,7 @@ public void mapFragmentRetainMockAccuracy_isFalse() {
     }
 
     @Test
-    public void passingRetainMockAccuracyExtra_showSetItOnLocationClient() {
+    public void passingRetainMockAccuracyExtra_updatesMapFragmentState() {
         Intent intent = new Intent(ApplicationProvider.getApplicationContext(), GeoPointMapActivity.class);
         intent.putExtra(EXTRA_RETAIN_MOCK_ACCURACY, true);
         launcherRule.launch(intent);

geo/src/test/java/org/odk/collect/geo/geopoly/GeoPolyActivityTest.kt

@@ -27,6 +27,7 @@ import org.odk.collect.androidtest.ActivityScenarioExtensions.isFinishing
 import org.odk.collect.androidtest.ActivityScenarioLauncherRule
 import org.odk.collect.async.Scheduler
 import org.odk.collect.geo.Constants
+import org.odk.collect.geo.Constants.EXTRA_RETAIN_MOCK_ACCURACY
 import org.odk.collect.geo.DaggerGeoDependencyComponent
 import org.odk.collect.geo.GeoDependencyModule
 import org.odk.collect.geo.R
@@ -283,6 +284,25 @@ class GeoPolyActivityTest {
         assertThat(mapFragment.isPolyDraggable(0), equalTo(false))
     }
 
+    @Test
+    fun passingRetainMockAccuracyExtra_updatesMapFragmentState() {
+        val intent = Intent(
+            ApplicationProvider.getApplicationContext(),
+            GeoPolyActivity::class.java
+        )
+        intent.putExtra(EXTRA_RETAIN_MOCK_ACCURACY, true)
+        launcherRule.launch<Activity>(intent)
+        mapFragment.ready()
+
+        assertThat(mapFragment.isRetainMockAccuracy(), equalTo(true))
+
+        intent.putExtra(EXTRA_RETAIN_MOCK_ACCURACY, false)
+        launcherRule.launch<Activity>(intent)
+        mapFragment.ready()
+
+        assertThat(mapFragment.isRetainMockAccuracy(), equalTo(false))
+    }
+
     @Test
     fun recreatingTheActivityWithTheLayersDialogDisplayedDoesNotCrashTheApp() {
         val scenario = launcherRule.launch(GeoPolyActivity::class.java)

mapbox/src/main/java/org/odk/collect/mapbox/MapboxLocationCallback.kt

@@ -112,7 +112,7 @@ class MapboxMapFragment :
     private var referenceLayerFile: File? = null
     private var clientWantsLocationUpdates = false
     private var topStyleLayerId: String? = null
-    private val locationCallback = MapboxLocationCallback(this)
+
     private val _mapViewModel by viewModels<MapViewModel> {
         viewModelFactory {
             addInitializer(MapViewModel::class) {
@@ -448,7 +448,7 @@ class MapboxMapFragment :
     }
 
     override fun setRetainMockAccuracy(retainMockAccuracy: Boolean) {
-        locationCallback.setRetainMockAccuracy(retainMockAccuracy)
+        locationClient.setRetainMockAccuracy(retainMockAccuracy)
     }
 
     override fun onMapClick(point: Point): Boolean {