awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix potential NPE if large sets of location markers get initialized

Browse Source
This commit is contained in:
cyBerta
2019-06-17 14:20:00 +02:00
parent 0e5ed5b395
commit 0b99c90a33
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/map/MapDataManager.java
+12 -4
View File
@@ -298,7 +298,9 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn
private void showLineLayer(MapSource source) {
LineLayer lineLayer = (LineLayer) mapboxStyle.getLayer(source.getLineLayer());
lineLayer.setProperties(visibility(showTraces ? VISIBLE : NONE));
if (lineLayer != null) {
lineLayer.setProperties(visibility(showTraces ? VISIBLE : NONE));
}
}
private void applyFilters(int[] contactIds) {
@@ -316,17 +318,23 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn
private void applyLastPositionFilter() {
SymbolLayer markerLayer = (SymbolLayer) mapboxStyle.getLayer(LAST_POSITION_LAYER);
markerLayer.setFilter(filterProvider.getTimeFilter());
if (markerLayer != null) {
markerLayer.setFilter(filterProvider.getTimeFilter());
}
}
private void applyMarkerFilter(MapSource source) {
SymbolLayer markerLayer = (SymbolLayer) mapboxStyle.getLayer(source.getMarkerLayer());
markerLayer.setFilter(filterProvider.getMarkerFilter());
if (markerLayer != null) {
markerLayer.setFilter(filterProvider.getMarkerFilter());
}
}
private void applyLineFilter(MapSource source) {
LineLayer lineLayer = (LineLayer) mapboxStyle.getLayer(source.getLineLayer());
lineLayer.setFilter(filterProvider.getTimeFilter());
if (lineLayer != null) {
lineLayer.setFilter(filterProvider.getTimeFilter());
}
}
private int[] getContactIds(int chatId) {