fix: crash on android api 22 & 23

sAleksovski · Nov 19, 2024 · 115da7c · 115da7c
1 parent b022ef6
commit 115da7c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix crash on API 22 & 23
+
 ## [0.14.1] - 2024-05-25
 
 ### Fixed

diff --git a/android/src/main/java/com/reactnativeandroidwidget/builder/ClickableView.java b/android/src/main/java/com/reactnativeandroidwidget/builder/ClickableView.java
@@ -4,7 +4,7 @@
 
 import com.facebook.react.bridge.ReadableMap;
 
-public class ClickableView {
+public class ClickableView implements Comparable<ClickableView> {
     private final String id;
     private final View view;
     private final String clickAction;
@@ -32,4 +32,9 @@ public String getClickAction() {
     public ReadableMap getClickActionData() {
         return clickActionData;
     }
+
+    @Override
+    public int compareTo(ClickableView o) {
+        return this.id.compareTo(o.getId());
+    }
 }
diff --git a/android/src/main/java/com/reactnativeandroidwidget/builder/WidgetFactory.java b/android/src/main/java/com/reactnativeandroidwidget/builder/WidgetFactory.java
@@ -23,7 +23,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 
@@ -47,7 +46,7 @@ public static WidgetWithViews buildWidgetFromRoot(ReactApplicationContext contex
 
         ResourceUtils.clear();
 
-        widgetFactory.clickableViews.sort(Comparator.comparing(ClickableView::getId));
+        Collections.sort(widgetFactory.clickableViews);
         return new WidgetWithViews(view, widgetFactory.clickableViews, widgetFactory.collectionViews);
     }