diff --git a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
index 5eb979e..e696bd5 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
@@ -65,12 +65,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private DnsServersFragment mDnsServers;
     private int currentFragment = FRAGMENT_NONE;
 
-    private MainFragment.MainFragmentHandler mHandler = null;
-
-    public void setMainFragmentHandler(MainFragment.MainFragmentHandler mHandler) {
-        this.mHandler = mHandler;
-    }
-
     public static MainActivity getInstance() {
         return instance;
     }
@@ -291,8 +285,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             Daedalus.getInstance().deactivateService();
         } else if (launchAction == LAUNCH_ACTION_AFTER_DEACTIVATE) {
             Daedalus.updateShortcut(this.getApplicationContext());
-            if (currentFragment == FRAGMENT_MAIN && mHandler != null) {
-                mHandler.obtainMessage(MainFragment.MainFragmentHandler.MSG_REFRESH).sendToTarget();
+            if (currentFragment == FRAGMENT_MAIN && MainFragment.mHandler != null) {
+                MainFragment.mHandler.obtainMessage(MainFragment.MainFragmentHandler.MSG_REFRESH).sendToTarget();
             }
         }
 
diff --git a/app/src/main/java/org/itxtech/daedalus/fragment/MainFragment.java b/app/src/main/java/org/itxtech/daedalus/fragment/MainFragment.java
index 74aa05e..bb87b20 100644
--- a/app/src/main/java/org/itxtech/daedalus/fragment/MainFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/MainFragment.java
@@ -16,7 +16,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
-import org.itxtech.daedalus.activity.MainActivity;
 import org.itxtech.daedalus.service.DaedalusVpnService;
 import org.itxtech.daedalus.util.DnsServerHelper;
 
@@ -34,14 +33,13 @@ import org.itxtech.daedalus.util.DnsServerHelper;
 public class MainFragment extends Fragment {
 
     private View view = null;
-    private MainFragmentHandler mHandler = null;
+    public static MainFragmentHandler mHandler = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         mHandler = (new MainFragmentHandler()).setFragment(this);
-        MainActivity.getInstance().setMainFragmentHandler(mHandler);
     }
 
     @Override
@@ -68,7 +66,7 @@ public class MainFragment extends Fragment {
         super.onDetach();
 
         mHandler.shutdown();
-        MainActivity.getInstance().setMainFragmentHandler(null);
+        mHandler = null;
     }
 
     @Override
diff --git a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
index 7f5f8d6..70bc42c 100644
--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@@ -152,7 +152,8 @@ public class DaedalusVpnService extends VpnService implements Runnable {
         stopSelf();
 
         if (shouldRefresh && MainActivity.getInstance() != null && Daedalus.getInstance().isAppOnForeground()) {
-            MainActivity.getInstance().startActivity(new Intent(getApplicationContext(), MainActivity.class).putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_AFTER_DEACTIVATE));
+            MainActivity.getInstance().startActivity(new Intent(getApplicationContext(), MainActivity.class)
+                    .putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_AFTER_DEACTIVATE));
         } else if (shouldRefresh) {
             Daedalus.updateShortcut(getApplicationContext());
         }