erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Handled no pause in DTMF steps.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-09-20 10:42:18 -07:00
parent 1be489a235
commit d23e767796
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -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(

2
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
View file

@ -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),

1
app/src/main/res/values/strings.xml
View file

@ -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>