rename the query variable

Author: quiro91

app/src/main/java/net/squanchy/search/SearchActivity.kt

@@ -46,15 +46,15 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
     private lateinit var searchTextWatcher: SearchTextWatcher
 
     private var hasQuery: Boolean = false
-    private lateinit var query: String
+    private lateinit var initialQuery: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_search)
         enableLightNavigationBar(this)
         setupToolbar()
 
-        query = savedInstanceState?.getString(QUERY_KEY) ?: ""
+        initialQuery = savedInstanceState?.getString(QUERY_KEY) ?: ""
 
         with(searchComponent(this)) {
             searchService = service()
@@ -77,7 +77,7 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
 
         val searchSubscription = querySubject.throttleLast(QUERY_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
             .doOnNext(::updateSearchActionIcon)
-            .startWith(query)
+            .startWith(initialQuery)
             .flatMap(searchService::find)
             .distinctUntilChanged()
             .subscribeOn(Schedulers.io())
@@ -189,8 +189,8 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle?) {
-        outState?.putString(QUERY_KEY, searchField.text?.toString())
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putString(QUERY_KEY, searchField.text?.toString())
         super.onSaveInstanceState(outState)
     }