refactoring

KnollFrank · Dec 19, 2024 · e72f6fe · e72f6fe
1 parent 0747499
commit e72f6fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/.../net/osmand/plus/settings/fragments/search/PreferenceDialogAndSearchableInfoProvider.java b/.../net/osmand/plus/settings/fragments/search/PreferenceDialogAndSearchableInfoProvider.java
@@ -14,14 +14,10 @@ public Optional<PreferenceDialogAndSearchableInfoByPreferenceDialogProvider<?>>
 			final Preference preference,
 			final PreferenceFragmentCompat hostOfPreference) {
 		// FK-TODO: handle more preference dialogs, which shall be searchable
-		if (hostOfPreference instanceof final SearchablePreferenceDialogProvider searchablePreferenceDialogProvider) {
-			return searchablePreferenceDialogProvider.getPreferenceDialogAndSearchableInfoByPreferenceDialogProvider(preference);
-		}
-		if (hostOfPreference instanceof final ShowableSearchablePreferenceDialogProvider showableSearchablePreferenceDialogProvider) {
-			return showableSearchablePreferenceDialogProvider
-					.getShowableSearchablePreferenceDialog(preference, null)
-					.map(ShowableSearchablePreferenceDialog::asPreferenceDialogAndSearchableInfoByPreferenceDialogProvider);
-		}
-		return Optional.empty();
+		return hostOfPreference instanceof final ShowableSearchablePreferenceDialogProvider showableSearchablePreferenceDialogProvider ?
+				showableSearchablePreferenceDialogProvider
+						.getShowableSearchablePreferenceDialog(preference, null)
+						.map(ShowableSearchablePreferenceDialog::asPreferenceDialogAndSearchableInfoByPreferenceDialogProvider) :
+				Optional.empty();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/search/SearchablePreferenceDialogProvider.java b/OsmAnd/src/net/osmand/plus/settings/fragments/search/SearchablePreferenceDialogProvider.java