refactored max/min repetitions to receiver constant

fixed incorrectly initialized repetition buttons when editing receiver
Power-Switch · May 3, 2016 · 6094027 · 6094027
1 parent d62a441
commit 6094027
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...r_switch/gui/fragment/configure_receiver/ConfigureReceiverDialogPage4GatewayFragment.java b/...r_switch/gui/fragment/configure_receiver/ConfigureReceiverDialogPage4GatewayFragment.java
@@ -134,7 +134,7 @@ public void onClick(View v) {
 
                 buttonMinus.setEnabled(true);
 
-                if (repetitionAmount >= 3) {
+                if (repetitionAmount >= Receiver.MAX_REPETITIONS) {
                     buttonPlus.setEnabled(false);
                 }
 
@@ -151,7 +151,7 @@ public void onClick(View v) {
 
                 buttonPlus.setEnabled(true);
 
-                if (repetitionAmount <= 1) {
+                if (repetitionAmount <= Receiver.MIN_REPETITIONS) {
                     buttonMinus.setEnabled(false);
                 }
 
@@ -206,6 +206,13 @@ private void initializeReceiverData(long receiverId) {
             Receiver receiver = DatabaseHandler.getReceiver(receiverId);
             repetitionAmount = receiver.getRepetitionAmount();
             textView_repetitionAmount.setText(String.valueOf(repetitionAmount));
+            if (repetitionAmount >= Receiver.MAX_REPETITIONS) {
+                buttonPlus.setEnabled(false);
+            }
+            if (repetitionAmount <= Receiver.MIN_REPETITIONS) {
+                buttonMinus.setEnabled(false);
+            }
+
 
             room = DatabaseHandler.getRoom(receiver.getRoomId());
 

diff --git a/Smartphone/src/main/java/eu/power_switch/obj/receiver/Receiver.java b/Smartphone/src/main/java/eu/power_switch/obj/receiver/Receiver.java
@@ -122,6 +122,16 @@ public abstract class Receiver {
         }
     };
 
+    /**
+     * Maximum value for network signal repetitions
+     */
+    public static final int MAX_REPETITIONS = 3;
+
+    /**
+     * Minimum value for network signal repetitions
+     */
+    public static final int MIN_REPETITIONS = 1;
+
     protected Context context;
     /**
      * ID of this Receiver