Fix crash when mycroft ip is not set

kamir86 · Dec 1, 2020 · 087df31 · 087df31
1 parent e4ea06a
commit 087df31
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/app/src/main/java/it/awt/mycroft/deepspeech/ui/main/SpeechViewModel.kt b/app/src/main/java/it/awt/mycroft/deepspeech/ui/main/SpeechViewModel.kt
@@ -70,20 +70,21 @@ class SpeechViewModel(application: Application) : AndroidViewModel(application)
 
     fun sendRequest(requestPhrase: String) {
         val mycroftIp = PreferenceManager.getDefaultSharedPreferences(this.getApplication()).getString("mycroft_ip", null)
-        if(mycroftIp == null){
+        if(mycroftIp.isNullOrBlank()){
             spokenList.postValue(spokenList.value.orEmpty().toMutableList().apply {
                 this.add(Utterance(UtteranceActor.MYCROFT, "Impostare l'ip di mycroft sulle impostazioni"))
             })
-        }
-        GlobalScope.launch(Dispatchers.IO) {
-            MycroftRequestUseCase().postRequest(mycroftIp!!, requestPhrase).consume(onSuccess = {
-                Log.i("response", "response: " + it)
-                spokenList.postValue(spokenList.value.orEmpty().toMutableList().apply {
-                    this.add(Utterance(UtteranceActor.MYCROFT, it))
-                })
-            }, onError = {
+        } else {
+            GlobalScope.launch(Dispatchers.IO) {
+                MycroftRequestUseCase().postRequest(mycroftIp!!, requestPhrase).consume(onSuccess = {
+                    Log.i("response", "response: " + it)
+                    spokenList.postValue(spokenList.value.orEmpty().toMutableList().apply {
+                        this.add(Utterance(UtteranceActor.MYCROFT, it))
+                    })
+                }, onError = {
 
-            })
+                })
+            }
         }
     }
 }