Fix issue where view state would update and delete space from user query (#737)

Author: subsymbolic

app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt

@@ -85,6 +85,18 @@ class SystemSearchViewModelTest {
         assertEquals(autocompleteQueryResult, newViewState?.autocompleteResults)
     }
 
+    @Test
+    fun whenUserAddsSpaceToQueryThenViewStateMatchesAndSpaceTrimmedFromAutocomplete() = ruleRunBlockingTest {
+        testee.userUpdatedQuery(QUERY)
+        testee.userUpdatedQuery("$QUERY ")
+
+        val newViewState = testee.viewState.value
+        assertNotNull(newViewState)
+        assertEquals("$QUERY ", newViewState?.queryText)
+        assertEquals(appQueryResult, newViewState?.appResults)
+        assertEquals(autocompleteQueryResult, newViewState?.autocompleteResults)
+    }
+
     @Test
     fun whenUserClearsQueryThenViewStateReset() = ruleRunBlockingTest {
         testee.userUpdatedQuery(QUERY)

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt

@@ -91,22 +91,21 @@ class SystemSearchViewModel(
 
         appsJob?.cancel()
 
-        val trimmedQuery = query.trim()
-
-        if (trimmedQuery == currentViewState().queryText) {
+        if (query == currentViewState().queryText) {
             return
         }
 
-        if (trimmedQuery.isBlank()) {
+        if (query.isBlank()) {
             userClearedQuery()
             return
         }
 
-        viewState.value = currentViewState().copy(queryText = trimmedQuery)
-        autoCompletePublishSubject.accept(trimmedQuery)
+        viewState.value = currentViewState().copy(queryText = query)
 
+        val trimmedQuery = query.trim()
+        autoCompletePublishSubject.accept(trimmedQuery)
         appsJob = viewModelScope.launch(dispatchers.io()) {
-            updateAppResults(deviceAppLookup.query(query))
+            updateAppResults(deviceAppLookup.query(trimmedQuery))
         }
     }