From 2edc43fd95cd736e100fe7d88e2da24aa51caa5b Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Fri, 7 Dec 2018 15:47:20 +0100
Subject: [PATCH] SttDialog

---
 .../adrienmalin/pingpoints/MatchActivity.kt   | 11 ++--------
 .../java/adrienmalin/pingpoints/SttDialog.kt  | 22 ++++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index 04f7db1..b1e1335 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -51,15 +51,8 @@ class MatchActivity : AppCompatActivity() {
                     val player1Name = getStringExtra("player1Name")
                     val player2Name = getStringExtra("player2Name")
                     players = listOf(
-                        Player(
-                            getStringExtra("player1Name"),
-                            0,
-                            Pattern.compile(getString(R.string.pattern, player1Name))
-                        ), Player(
-                            player2Name,
-                            0,
-                            Pattern.compile(getString(R.string.pattern, player2Name))
-                        )
+                        Player(player1Name, 0, Pattern.compile(getString(R.string.pattern, player1Name))),
+                        Player(player2Name, 0, Pattern.compile(getString(R.string.pattern, player2Name)))
                     )
                     serviceSide = getIntExtra("starterId", 0)
                     relaunchSide = when(serviceSide) {
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index 8e20653..e8ff180 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -24,6 +24,7 @@ class SttDialog : DialogFragment() {
     var sttIntent: Intent? = null
 
     inner class SttListener : RecognitionListener {
+        val ERROR_NOT_UNDERSTOOD = 1
         var minRms: Float = 0f
         var maxRms: Float = 0f
 
@@ -42,25 +43,20 @@ class SttDialog : DialogFragment() {
         }
 
         override fun onResults(data: Bundle) {
-            var understood = false
             data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.let { results ->
                 matchActivity?.apply {
                     matchModel?.apply {
                         for (result in results) {
                             for (player in players) {
                                 if (player.pattern?.matcher(result)?.find() == true) {
-                                    understood = true
                                     dismiss()
                                     updateScore(player)
                                     updateUI()
-                                    break
+                                    return
                                 }
                             }
-                            if (understood) break
-                        }
-                        if (!understood) {
-                            onError(0)
                         }
+                        onError(ERROR_NOT_UNDERSTOOD)
                     }
                 }
             }
@@ -79,15 +75,15 @@ class SttDialog : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?) = AlertDialog.Builder(activity).apply {
-        (context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(R.layout.dialog_stt, null). apply {
-            partialResultsTextView = findViewById(R.id.partialResultTextView)
-            icStt = findViewById(R.id.icStt)
+        (context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(R.layout.dialog_stt, null).let { view ->
+            partialResultsTextView = view.findViewById(R.id.partialResultTextView)
+            icStt = view.findViewById(R.id.icStt)
 
-            setView(this)
+            setView(view)
 
             matchActivity = (activity as MatchActivity).apply {
                 matchModel?.apply {
-                    findViewById<TextView>(R.id.sttHintTextView).text = getString(
+                    view.findViewById<TextView>(R.id.sttHintTextView).text = getString(
                         R.string.STT_hint,
                         players[0].name,
                         players[1].name
@@ -96,8 +92,8 @@ class SttDialog : DialogFragment() {
                         putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
                         putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault().displayLanguage)
                         putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 10)
-                        putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, packageName)
                         putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
+                        putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true)
                     }
                     stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
                         setRecognitionListener(SttListener())