Merge pull request #21398 from osmandapp/fix_widgets_out_of_bounds_crash

Fix crash
osmandapp · Nov 22, 2024 · 6273de6 · 6273de6
2 parents 27b47fe + 678139d
commit 6273de6
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/...t/osmand/plus/views/mapwidgets/configure/settings/BaseResizableWidgetSettingFragment.java b/...t/osmand/plus/views/mapwidgets/configure/settings/BaseResizableWidgetSettingFragment.java
@@ -106,7 +106,6 @@ protected void applySettings() {
 			updateRowWidgets(widgetInfo);
 		}
 
-		widgetSizePref.set(selectedWidgetSize);
 		if (widgetInfo != null) {
 			if (widgetInfo.widget instanceof ISupportWidgetResizing widgetResizing) {
 				widgetResizing.recreateView();
@@ -117,13 +116,19 @@ protected void applySettings() {
 
 	private void updateRowWidgets(@NonNull MapWidgetInfo widgetInfo) {
 		MapActivity activity = getMapActivity();
-		if (activity != null) {
-			List<Set<MapWidgetInfo>> widgets = widgetRegistry.getPagedWidgetsForPanel(activity,
-					appMode, widgetInfo.getWidgetPanel(), AVAILABLE_MODE | ENABLED_MODE | MATCHING_PANELS_MODE);
-
-			Set<MapWidgetInfo> rowMapWidgetsInfo = widgets.get(widgetInfo.pageIndex);
-			rowMapWidgetsInfo.remove(widgetInfo);
-			applySizeSettingToWidgetsInRow(rowMapWidgetsInfo);
+		if (activity == null) {
+			return;
+		}
+		List<Set<MapWidgetInfo>> widgets = widgetRegistry.getPagedWidgetsForPanel(activity,
+				appMode, widgetInfo.getWidgetPanel(), AVAILABLE_MODE | ENABLED_MODE | MATCHING_PANELS_MODE);
+
+		for (Set<MapWidgetInfo> rowMapWidgetsInfo : widgets) {
+			for (MapWidgetInfo info : rowMapWidgetsInfo) {
+				if (info == widgetInfo) {
+					applySizeSettingToWidgetsInRow(rowMapWidgetsInfo);
+					return;
+				}
+			}
 		}
 	}