Fix arabic search (#21860)

* Fix arabic search * Fix arabic search
osmandapp · Feb 5, 2025 · c0dbd49 · c0dbd49
1 parent fad1638
commit c0dbd49
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
@@ -60,10 +60,12 @@ public boolean matches(String name) {
 
 	public static boolean cmatches(Collator collator, String fullName, String part, StringMatcherMode mode) {
 		if (ArabicNormalizer.isSpecialArabic(fullName)) {
-			fullName = ArabicNormalizer.normalize(fullName);
+			String normalized = ArabicNormalizer.normalize(fullName);
+			fullName = normalized == null ? fullName : normalized;
 		}
 		if (ArabicNormalizer.isSpecialArabic(part)) {
-			part = ArabicNormalizer.normalize(part);
+			String normalized = ArabicNormalizer.normalize(part);
+			part = normalized == null ? part : normalized;
 		}
 		switch (mode) {
 		case CHECK_CONTAINS: