Helper class refactored

Remove repeated code
DBarbosaDev · Oct 1, 2019 · 08aa33b · 08aa33b
1 parent 2a1fa54
commit 08aa33b
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/Android Studio Project/app/src/main/java/pt/diogobarbosa/dremote/Helper.java b/Android Studio Project/app/src/main/java/pt/diogobarbosa/dremote/Helper.java
@@ -18,12 +18,8 @@ protected void validateFirstMessage(JSONObject data, final String[]... serverInf
             } else {
 
                 if (data.getString("door_command").equals("open")) {
-                    Dremote_main._tvState.setText("Opened");
-                    Toast.makeText(Dremote_main._context, "Correct Message.", Toast.LENGTH_LONG).show();
-
-                    Dremote_main._formLayout.setVisibility(View.VISIBLE);
-                    Dremote_main._serverFieldsLayout.setVisibility(View.INVISIBLE);
-                    Dremote_main._buttonOpenLayout.setVisibility(View.INVISIBLE);
+                    setStatusText("Opened", "Correct Message.");
+                    setUIVisibility();
 
                     new Timer().schedule(new TimerTask() {
                         @Override
@@ -33,16 +29,12 @@ public void run() {
                     }, 4000);
 
                 } else {
-                    Dremote_main._tvState.setText("Closed");
-                    Toast.makeText(Dremote_main._context, "Command not found", Toast.LENGTH_LONG).show();
-
+                    setStatusText("Closed", "Command not found");
                 }
             }
-
         } catch (JSONException e) {
             Log.e("Validation Message 1:", "Error:", e);
         }
-
     }
 
     protected void validateSecondMessage(JSONObject data) {
@@ -70,4 +62,14 @@ private void restoreUI(){
         Dremote_main._buttonOpenLayout.setVisibility(View.VISIBLE);
     }
 
+    private void setStatusText(String dremoteMessage, String toastMessage){
+          Dremote_main._tvState.setText(dremoteMessage);
+          Toast.makeText(Dremote_main._context, toastMessage, Toast.LENGTH_LONG).show(); 
+    }
+
+    private void setUIVisibility(){
+            Dremote_main._formLayout.setVisibility(View.VISIBLE);
+            Dremote_main._serverFieldsLayout.setVisibility(View.INVISIBLE);
+            Dremote_main._buttonOpenLayout.setVisibility(View.INVISIBLE);
+    }
 }