From 4d971d74537be8b1bf6fea9d117674f6183c54e5 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 22 Jun 2020 01:27:57 +0200
Subject: [PATCH] add comments and newlines

---
 app/src/main/java/app/trigger/MqttDoorSetup.java            | 6 ++++--
 app/src/main/java/app/trigger/NukiDoorSetup.java            | 1 +
 app/src/main/java/app/trigger/SshDoorSetup.java             | 2 ++
 .../main/java/app/trigger/nuki/NukiLockActionCallback.java  | 2 +-
 app/src/main/java/app/trigger/nuki/NukiRequestHandler.java  | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/trigger/MqttDoorSetup.java b/app/src/main/java/app/trigger/MqttDoorSetup.java
index 7bb7c2b7..dc435325 100644
--- a/app/src/main/java/app/trigger/MqttDoorSetup.java
+++ b/app/src/main/java/app/trigger/MqttDoorSetup.java
@@ -17,13 +17,15 @@ public class MqttDoorSetup implements Setup {
     public String server;
     public String status_topic;
     public String command_topic;
+    public Boolean retained;
+    public int qos;
+
     public String open_command;
     public String close_command;
     public String ring_command;
+
     public String locked_pattern;
     public String unlocked_pattern;
-    public Boolean retained;
-    public int qos;
 
     public Bitmap open_image;
     public Bitmap closed_image;
diff --git a/app/src/main/java/app/trigger/NukiDoorSetup.java b/app/src/main/java/app/trigger/NukiDoorSetup.java
index 7d8ee4e8..e59eaa8d 100644
--- a/app/src/main/java/app/trigger/NukiDoorSetup.java
+++ b/app/src/main/java/app/trigger/NukiDoorSetup.java
@@ -14,6 +14,7 @@ public class NukiDoorSetup implements Setup {
     public String shared_key;
     public long auth_id;
     public long app_id;
+
     public Bitmap open_image;
     public Bitmap closed_image;
     public Bitmap unknown_image;
diff --git a/app/src/main/java/app/trigger/SshDoorSetup.java b/app/src/main/java/app/trigger/SshDoorSetup.java
index 89b71275..5a523b75 100644
--- a/app/src/main/java/app/trigger/SshDoorSetup.java
+++ b/app/src/main/java/app/trigger/SshDoorSetup.java
@@ -17,6 +17,7 @@ public class SshDoorSetup implements Setup {
     public String password;
     public String host;
     public int port;
+
     public String open_command;
     public String close_command;
     public String ring_command;
@@ -30,6 +31,7 @@ public class SshDoorSetup implements Setup {
     public Bitmap closed_image;
     public Bitmap unknown_image;
     public Bitmap disabled_image;
+
     public String register_url;
     public String ssids;
 
diff --git a/app/src/main/java/app/trigger/nuki/NukiLockActionCallback.java b/app/src/main/java/app/trigger/nuki/NukiLockActionCallback.java
index d4fc709a..b7f85f38 100644
--- a/app/src/main/java/app/trigger/nuki/NukiLockActionCallback.java
+++ b/app/src/main/java/app/trigger/nuki/NukiLockActionCallback.java
@@ -66,7 +66,7 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
                 Log.e(TAG, "writeCharacteristic failed for NukiLockAction");
                 closeConnection(gatt);
             }
-        } else if (command instanceof  NukiCommand.NukiStatus) {
+        } else if (command instanceof NukiCommand.NukiStatus) {
             NukiCommand.NukiStatus ns = (NukiCommand.NukiStatus) command;
             if (ns.status == NukiCommand.NukiStatus.STATUS_COMPLETE) {
                 // do not wait until the Nuki closes the connection
diff --git a/app/src/main/java/app/trigger/nuki/NukiRequestHandler.java b/app/src/main/java/app/trigger/nuki/NukiRequestHandler.java
index 90777ef9..8a4bb664 100644
--- a/app/src/main/java/app/trigger/nuki/NukiRequestHandler.java
+++ b/app/src/main/java/app/trigger/nuki/NukiRequestHandler.java
@@ -414,13 +414,13 @@ public void run() {
             this.listener.onTaskResult(setup.getId(), ReplyCode.LOCAL_ERROR, "Start Pairing.");
         } else switch (action) {
             case open_door:
-                callback = new NukiLockActionCallback(setup.getId(), this.listener, setup, 0x01);
+                callback = new NukiLockActionCallback(setup.getId(), this.listener, setup, 0x01 /*unlock*/);
                 break;
             case ring_door:
                 this.listener.onTaskResult(setup.getId(), ReplyCode.LOCAL_ERROR, "Bell not supported.");
                 return;
             case close_door:
-                callback = new NukiLockActionCallback(setup.getId(), this.listener, setup, 0x02);
+                callback = new NukiLockActionCallback(setup.getId(), this.listener, setup, 0x02 /*lock*/);
                 break;
             default:
             case fetch_state: