1 files changed, 13 insertions, 14 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java b/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java
index ca1b9922..e3003f2e 100644
--- a/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java
@@ -33,9 +33,8 @@ import com.wireguard.android.util.ExceptionLoggers;
  */
 
 public abstract class BaseFragment extends Fragment implements OnSelectedTunnelChangedListener {
-    private static final String TAG = "WireGuard/" + BaseFragment.class.getSimpleName();
     private static final int REQUEST_CODE_VPN_PERMISSION = 23491;
-
+    private static final String TAG = "WireGuard/" + BaseFragment.class.getSimpleName();
     @Nullable private BaseActivity activity;
     @Nullable private Tunnel pendingTunnel;
     @Nullable private Boolean pendingTunnelUp;
@@ -46,6 +45,18 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
     }
 
     @Override
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CODE_VPN_PERMISSION) {
+            if (pendingTunnel != null && pendingTunnelUp != null)
+                setTunnelStateWithPermissionsResult(pendingTunnel, pendingTunnelUp);
+            pendingTunnel = null;
+            pendingTunnelUp = null;
+        }
+    }
+
+    @Override
     public void onAttach(final Context context) {
         super.onAttach(context);
         if (context instanceof BaseActivity) {
@@ -64,18 +75,6 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
         super.onDetach();
     }
 
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == REQUEST_CODE_VPN_PERMISSION) {
-            if (pendingTunnel != null && pendingTunnelUp != null)
-                setTunnelStateWithPermissionsResult(pendingTunnel, pendingTunnelUp);
-            pendingTunnel = null;
-            pendingTunnelUp = null;
-        }
-    }
-
     protected void setSelectedTunnel(@Nullable final Tunnel tunnel) {
         if (activity != null)
             activity.setSelectedTunnel(tunnel);