From 21d05faa2a0b793d3d794d5070c297811d013008 Mon Sep 17 00:00:00 2001
From: Mushegh98 <musheghsahakyan98@gmail.com>
Date: Tue, 9 Jun 2020 14:18:18 +0400
Subject: [PATCH] Refactor code.

---
 .../wireguard/android/activity/MainActivity.java  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
index 10d514e..71a70d4 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
@@ -10,7 +10,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 import com.wireguard.android.R;
 import com.wireguard.android.viewmodel.MainViewModel;
 
@@ -41,12 +40,10 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         if (mainViewModel.isVPNConnected(this, connectionStateFlag)) {
             connectionStateFlag = false;
-            bubbleStatus.setText(getString(R.string.not_connected_bubble));
-            connectButton.setText(getString(R.string.connect));
+            setConnectionStateUI(false);
         } else {
             connectionStateFlag = true;
-            bubbleStatus.setText(getString(R.string.connected_bubble));
-            connectButton.setText(getString(R.string.disconnect));
+            setConnectionStateUI(true);
         }
     }
 
@@ -90,20 +87,16 @@ public class MainActivity extends AppCompatActivity {
                         });
             } else {
                 connectionStateFlag = false;
-                Toast.makeText(this, getString(R.string.not_connected_bubble), Toast.LENGTH_SHORT).show();
-                bubbleStatus.setText(getString(R.string.not_connected_bubble));
-                connectButton.setText(getString(R.string.connect));
+                setConnectionStateUI(false);
             }
         }
     }
 
-    private void setConnectionStateUI(boolean state){
+    private void setConnectionStateUI(boolean state) {
         if (state) {
-            Toast.makeText(this, getString(R.string.connected_bubble), Toast.LENGTH_SHORT).show();
             bubbleStatus.setText(getString(R.string.connected_bubble));
             connectButton.setText(getString(R.string.disconnect));
         } else {
-            Toast.makeText(this, getString(R.string.not_connected_bubble), Toast.LENGTH_SHORT).show();
             bubbleStatus.setText(getString(R.string.not_connected_bubble));
             connectButton.setText(getString(R.string.connect));
         }