fix: Null check for destroying Android ASR

spokestack · Aug 12, 2020 · c84393d · c84393d
1 parent 5747c42
commit c84393d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/io/spokestack/spokestack/android/AndroidSpeechRecognizer.java b/src/main/java/io/spokestack/spokestack/android/AndroidSpeechRecognizer.java
@@ -165,8 +165,10 @@ public void reset() {
     @Override
     public void close() {
         this.taskHandler.run(() -> {
-            this.speechRecognizer.destroy();
-            this.speechRecognizer = null;
+            if (this.speechRecognizer != null) {
+                this.speechRecognizer.destroy();
+                this.speechRecognizer = null;
+            }
         });
     }
 

diff --git a/src/test/java/io/spokestack/spokestack/android/AndroidSpeechRecognizerTest.java b/src/test/java/io/spokestack/spokestack/android/AndroidSpeechRecognizerTest.java
@@ -74,6 +74,19 @@ private void configureRecognizer(SpeechRecognizer target,
         ).when(target).setRecognitionListener(any());
     }
 
+    @Test
+    public void testClose() {
+        SpeechConfig config = new SpeechConfig();
+        config.put("trace-level", EventTracer.Level.DEBUG.value());
+        config.put("min-active", 500);
+        AndroidSpeechRecognizer speechRecognizer =
+              spy(new AndroidSpeechRecognizer(config, new TaskHandler(false)));
+        doReturn(null).when(speechRecognizer).createRecognitionIntent();
+
+        // closing before establishing a recognizer is safe
+        assertDoesNotThrow(speechRecognizer::close);
+    }
+
     @Test
     public void testProcess() {
         SpeechConfig config = new SpeechConfig();