tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(android): guard stale layer remove path (#4300)

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
liyanjin
2026-05-27 10:03:21 +08:00
committed by GitHub
parent b41590e474
commit f3c29ccf0b
3 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java
View File

@@ -9,6 +9,7 @@ import androidx.test.espresso.ViewAction;
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
import org.maplibre.android.style.layers.CannotAddLayerException;
import org.maplibre.android.style.layers.BackgroundLayer;
import org.maplibre.android.style.layers.CircleLayer;
import org.maplibre.android.style.layers.FillLayer;
import org.maplibre.android.style.layers.Layer;
@@ -22,6 +23,7 @@ import org.maplibre.android.style.sources.Source;
import org.maplibre.android.style.sources.VectorSource;
import org.maplibre.android.testapp.R;
import org.maplibre.android.testapp.activity.EspressoTest;
import org.maplibre.android.maps.Style;
import org.hamcrest.Matcher;
import org.junit.Assert;
@@ -300,6 +302,53 @@ public class RuntimeStyleTests extends EspressoTest {
});
}
@Test
public void testRemoveStaleLayerReferenceDoesNotCrash() {
validateTestSetup();
onView(withId(R.id.mapView)).perform(new BaseViewAction() {
@Override
public void perform(UiController uiController, View view) {
final Layer[] staleLayerHolder = new Layer[1];
final Throwable[] errorHolder = new Throwable[1];
final Boolean[] removeResultHolder = new Boolean[1];
final boolean[] finished = new boolean[] { false };
Style.Builder styleABuilder = new Style.Builder()
.withLayer(new BackgroundLayer("stale-layer-a")
.withProperties(PropertyFactory.backgroundColor(Color.BLUE)));
Style.Builder styleBBuilder = new Style.Builder()
.withLayer(new BackgroundLayer("style-b-background")
.withProperties(PropertyFactory.backgroundColor(Color.DKGRAY)));
maplibreMap.setStyle(styleABuilder, styleA -> {
staleLayerHolder[0] = styleA.getLayer("stale-layer-a");
maplibreMap.setStyle(styleBBuilder, styleB -> {
try {
removeResultHolder[0] = styleB.removeLayer(staleLayerHolder[0]);
} catch (Throwable error) {
errorHolder[0] = error;
} finally {
finished[0] = true;
}
});
});
long timeoutMs = 5000;
long startMs = System.currentTimeMillis();
while (!finished[0] && System.currentTimeMillis() - startMs < timeoutMs) {
uiController.loopMainThreadForAtLeast(50);
}
assertTrue("Style switch did not finish in time", finished[0]);
assertNotNull("Stale layer should have been captured", staleLayerHolder[0]);
assertNull("Removing stale layer reference should not throw", errorHolder[0]);
assertFalse("Removing stale layer reference should fail gracefully",
Boolean.TRUE.equals(removeResultHolder[0]));
}
});
}
/**
* https://github.com/mapbox/mapbox-gl-native/issues/7973
*/