From d23e7677967a9af6eb97694bf8e80111cb3243e8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 20 Sep 2016 10:42:18 -0700
Subject: [PATCH] Handled no pause in DTMF steps.

---
 .../erik/android/tesremoteprogrammer/MainActivity.kt      | 8 ++++++++
 .../android/tesremoteprogrammer/ProgrammingActivity.kt    | 2 +-
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
index bbaa30b..11d3a74 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
@@ -423,6 +423,14 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
                                 val blank = "\\0"
                                 val mock = Dtmf.mock(option, blank)
 
+                                if (!mock.contains(MainActivity.PAUSE)) { // no pause
+                                    errors.append(getString(
+                                            R.string.validate_invalid_opts_prop,
+                                            i + 1,
+                                            "dtmf",
+                                            getString(R.string.validate_dtmf_nopause)))
+                                }
+
                                 if (!Dtmf.validate(mock,
                                         "${MainActivity.PAUSE}${params.ack}${params.alt}$blank")) {
                                     errors.append(getString(
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
index 37c244c..827b0b3 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
@@ -177,7 +177,7 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
                                 }
 
                                 startActivity<StepsActivity>(
-                                        StepsActivity.EXTRA_STEPS to "$begin$dtmf$end".split(','))
+                                        StepsActivity.EXTRA_STEPS to "$begin$dtmf$end".split(MainActivity.PAUSE))
                             } else {
                                 Snackbar.make(this@coordinatorLayout,
                                         getString(R.string.error_invalid_dtmf, dtmf),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e92593..e5b41de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="hint_phone_number">Phone Number</string>
     <string name="programming_heading">PROGRAMMING</string>
     <string name="title_template_step">Step <xliff:g id="step_number">%1$d</xliff:g> of <xliff:g id="steps_count">%2$d</xliff:g></string>
+    <string name="validate_dtmf_nopause">Missing pause between steps</string>
     <string name="validate_invalid_option">&lt;p>&lt;b>opts[<xliff:g id="opts">%1$d</xliff:g>]&lt;/b>: invalid &lt;font color=\"red\"><xliff:g id="prop">%2$s</xliff:g>&lt;/font>&lt;/p></string>
     <string name="validate_invalid_param">&lt;p>&lt;b>params&lt;/b>: invalid &lt;font color=\"red\"><xliff:g id="param">%1$s</xliff:g>&lt;/font>&lt;/p></string>
     <string name="validate_invalid_field_prop">&lt;p>&lt;b>opts[<xliff:g id="opts">%1$d</xliff:g>]&lt;/b>, &lt;b>fields[<xliff:g id="field">%2$d</xliff:g>]&lt;/b>, invalid &lt;font color=\"red\"><xliff:g id="prop">%3$s</xliff:g>&lt;/font>:&lt;br>&#160;&#160;&#160;&#160;&lt;font color=\"red\"><xliff:g id="attr">%4$s</xliff:g>&lt;/font>&lt;/p></string>