Skip to content

Commit 0546f28

Browse files
committed
* Stop repeat sound on dismiss disarm dialog
1 parent 3427e6e commit 0546f28

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ repositories {
4040
def versionMajor = 0
4141
def versionMinor = 7
4242
def versionPatch = 0
43-
def versionBuild = 0 // bump for dog food builds, public betas, etc.
43+
def versionBuild = 1 // bump for dog food builds, public betas, etc.
4444

4545
def ALARM_CODE() {
4646
Properties properties = new Properties()

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/DialogUtils.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
5454

5555
private var alertDialog: AlertDialog? = null
5656
private var dialog: Dialog? = null
57-
private var disableDialog: Dialog? = null
5857
private var screenSaverDialog: Dialog? = null
5958

6059
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
@@ -63,10 +62,7 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
6362
dialog!!.dismiss()
6463
dialog = null
6564
}
66-
if (disableDialog != null && disableDialog!!.isShowing) {
67-
disableDialog!!.dismiss()
68-
disableDialog = null
69-
}
65+
7066
if (alertDialog != null && alertDialog!!.isShowing) {
7167
alertDialog!!.dismiss()
7268
alertDialog = null

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/SoundUtils.kt

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class SoundUtils(base: Context) : ContextWrapper(base) {
2828
Timber.d("destroyBuzzer")
2929
soundHandler?.post(Runnable { soundHandler?.removeCallbacks(repeatAudioRunnable) })
3030
soundHandler?.post(Runnable { soundHandler?.removeCallbacks(streamAudioRunnable) })
31+
stopBuzzerRepeat()
3132
}
3233

3334
fun playBuzzerOnButtonPress() {

0 commit comments

Comments
 (0)