1 files changed, 18 insertions, 18 deletions

diff --git a/app/src/main/java/com/wireguard/android/QuickTileService.java b/app/src/main/java/com/wireguard/android/QuickTileService.java
index 28e2b2ee..2463896e 100644
--- a/app/src/main/java/com/wireguard/android/QuickTileService.java
+++ b/app/src/main/java/com/wireguard/android/QuickTileService.java
@@ -40,9 +40,9 @@ public class QuickTileService extends TileService {
 
     private final OnStateChangedCallback onStateChangedCallback = new OnStateChangedCallback();
     private final OnTunnelChangedCallback onTunnelChangedCallback = new OnTunnelChangedCallback();
-    @Nullable private Tunnel tunnel;
-    @Nullable private Icon iconOn;
     @Nullable private Icon iconOff;
+    @Nullable private Icon iconOn;
+    @Nullable private Tunnel tunnel;
 
     /* This works around an annoying unsolved frameworks bug some people are hitting. */
     @Override
@@ -58,6 +58,22 @@ public class QuickTileService extends TileService {
     }
 
     @Override
+    public void onClick() {
+        if (tunnel != null) {
+            final Tile tile = getQsTile();
+            if (tile != null) {
+                tile.setIcon(tile.getIcon() == iconOn ? iconOff : iconOn);
+                tile.updateTile();
+            }
+            tunnel.setState(State.TOGGLE).whenComplete(this::onToggleFinished);
+        } else {
+            final Intent intent = new Intent(this, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivityAndCollapse(intent);
+        }
+    }
+
+    @Override
     public void onCreate() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             iconOff = iconOn = Icon.createWithResource(this, R.drawable.ic_tile);
@@ -80,22 +96,6 @@ public class QuickTileService extends TileService {
     }
 
     @Override
-    public void onClick() {
-        if (tunnel != null) {
-            final Tile tile = getQsTile();
-            if (tile != null) {
-                tile.setIcon(tile.getIcon() == iconOn ? iconOff : iconOn);
-                tile.updateTile();
-            }
-            tunnel.setState(State.TOGGLE).whenComplete(this::onToggleFinished);
-        } else {
-            final Intent intent = new Intent(this, MainActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivityAndCollapse(intent);
-        }
-    }
-
-    @Override
     public void onStartListening() {
         Application.getTunnelManager().addOnPropertyChangedCallback(onTunnelChangedCallback);
         if (tunnel != null)