From 6c22545f97b8a7a5f1923de10c22d87864668fdc Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:56:29 +0900
Subject: [PATCH] fix crash on search activity from null value

---
 .../gramophone/activities/SearchActivity.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
index 7e0eaeb0..c4a4d8ef 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
@@ -55,9 +55,11 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
 
         setNavigationBarColorAuto();
         setTaskDescriptionColorAuto();
+        setUpToolBar();
 
-        binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        handler = new Handler();
         adapter = new SearchAdapter(this, Collections.emptyList());
+
         adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
             @Override
             public void onChanged() {
@@ -66,18 +68,12 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
             }
         });
 
+        binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
         binding.recyclerView.setAdapter(adapter);
         binding.recyclerView.setOnTouchListener((v, event) -> {
             hideSoftKeyboard();
             return false;
         });
-
-        setUpToolBar();
-
-        query = savedInstanceState.getString(QUERY, "");
-        handler = new Handler();
-
-        search(query);
     }
 
     @Override
@@ -87,6 +83,13 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
         outState.putString(QUERY, query);
     }
 
+    @Override
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        search(savedInstanceState.getString(QUERY, ""));
+    }
+
     private void setUpToolBar() {
         binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
         setSupportActionBar(binding.toolbar);