From 7d2883e044ea174eb11bf2ffbcf4cbdb1aa7f69e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 23 Jan 2024 11:41:58 -0300
Subject: [PATCH] [app] don't try to sanitize null search term

---
 .../java/org/fdroid/fdroid/views/main/MainActivity.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 7200f2fbd..d803909da 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity {
     private void handleSearchOrAppViewIntent(Intent intent) {
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
             String query = intent.getStringExtra(SearchManager.QUERY);
-            performSearch(query);
+            if (query != null) performSearch(query);
             return;
         }
 
@@ -372,14 +372,14 @@ public class MainActivity extends AppCompatActivity {
     /**
      * These strings might end up in a SQL query, so strip all non-alpha-num
      */
-    static String sanitizeSearchTerms(String query) {
+    static String sanitizeSearchTerms(@NonNull String query) {
         return query.replaceAll("[^\\p{L}\\d_ -]", " ");
     }
 
     /**
      * Initiates the {@link AppListActivity} with the relevant search terms passed in via the query arg.
      */
-    private void performSearch(String query) {
+    private void performSearch(@NonNull String query) {
         Intent searchIntent = new Intent(this, AppListActivity.class);
         searchIntent.putExtra(AppListActivity.EXTRA_SEARCH_TERMS, sanitizeSearchTerms(query));
         startActivity(searchIntent);