Merge pull request #20290 from wordpress-mobile/issue/20249-reader-cr…

…ash-search-null-query [Reader][Crash] Make sure query is not null in Reader Search
wordpress-mobile · Feb 26, 2024 · f831640 · f831640
2 parents 6fbf3fd + 2069c8c
commit f831640
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchJobService.java b/...src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchJobService.java
@@ -17,7 +17,7 @@ public class ReaderSearchJobService extends JobService implements ServiceComplet
     private ReaderSearchLogic mReaderSearchLogic;
 
     @Override public boolean onStartJob(JobParameters params) {
-        if (params.getExtras() != null && params.getExtras().containsKey(ARG_QUERY)) {
+        if (params.getExtras() != null && params.getExtras().getString(ARG_QUERY) != null) {
             String query = params.getExtras().getString(ARG_QUERY);
             int offset = params.getExtras().getInt(ARG_OFFSET, 0);
             mReaderSearchLogic.startSearch(query, offset, params);

diff --git a/...ress/src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchLogic.java b/...ress/src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchLogic.java
@@ -1,5 +1,7 @@
 package org.wordpress.android.ui.reader.services.search;
 
+import androidx.annotation.NonNull;
+
 import com.android.volley.VolleyError;
 import com.wordpress.rest.RestRequest;
 
@@ -24,7 +26,7 @@ public ReaderSearchLogic(ServiceCompletionListener listener) {
         mCompletionListener = listener;
     }
 
-    public void startSearch(final String query, final int offset, Object companion) {
+    public void startSearch(@NonNull final String query, final int offset, Object companion) {
         mListenerCompanion = companion;
         String path = "read/search?q="
                       + UrlUtils.urlEncode(query)