Skip to content

Commit 54d605c

Browse files
author
Michael Ritchie
committed
* When not connected to MQTT broker, allow UI to disarm
* Null pointer exception handling * Bump version number
1 parent 84f7543 commit 54d605c

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.neenbedankt.android-apt'
2121

2222
def versionMajor = 0
2323
def versionMinor = 2
24-
def versionPatch = 2
24+
def versionPatch = 3
2525
def versionBuild = 0 // bump for dog food builds, public betas, etc.
2626

2727
android {

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/ControlsFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ private void showAlarmDisableDialog(boolean beep) {
316316
@Override
317317
public void onComplete(int pin) {
318318
mListener.publishDisarmed();
319+
setDisarmedView();
319320
hideDialog();
320321
}
321322
@Override

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/AlarmDisableView.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ public void onFinish() {
8888
@Override
8989
protected void onDetachedFromWindow() {
9090
super.onDetachedFromWindow();
91-
handler.removeCallbacks(delayRunnable);
91+
if(handler != null) {
92+
handler.removeCallbacks(delayRunnable);
93+
}
9294
if(countDownTimer != null) {
9395
countDownTimer.cancel();
9496
countDownTimer = null;

0 commit comments

Comments
 (0)