Refactor WifiScanConnect.BroadcastReceiver to get timer as parameter

tink-expo · Nov 30, 2019 · 522eae4 · 522eae4
1 parent 900c18f
commit 522eae4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/ProcessingActivity.java b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/ProcessingActivity.java
@@ -126,21 +126,7 @@ public void tryWifiConnect() {
             SsidPwPick ssidPwPick = new SsidPwPick(receivedTextBlockList, receivedWifiDataList);
             final SsidPw ssidPw = getSsidPw();
 
-            wifiConnectReceiver = WifiScanConnect.connectAndRegisterReceiver(this, wifiManager, new IntentFilter(), ssidPw);
-            Log.d(TAG, "Start timer");
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    Log.d(TAG, "Run timer");
-                    ProcessingActivity activity = mWeakReference.get();
-                    if (activity != null && !activity.isFinishing()) {
-                        Intent failIntent = new Intent(activity, FailActivity.class);
-                        failIntent.putExtra("id", ssidPw.ssid);
-                        failIntent.putExtra("pw", ssidPw.pw);
-                        startActivity(failIntent);
-                    }
-                }
-            }, 3500);
+            wifiConnectReceiver = WifiScanConnect.connectAndRegisterReceiver(this, wifiManager, new IntentFilter(), ssidPw, timer);
         }
     }
 

diff --git a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/WifiScanConnect.java b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/WifiScanConnect.java
@@ -18,6 +18,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 public class WifiScanConnect {
     final static String TAG = "WifiScanConnect";
@@ -36,7 +38,7 @@ public static BroadcastReceiver scanAndRegisterReceiver(
 
     public static BroadcastReceiver connectAndRegisterReceiver(
             final AppCompatActivity activity, final WifiManager wifiManager,
-            IntentFilter intentFilter, final SsidPw ssidPw) {
+            IntentFilter intentFilter, final SsidPw ssidPw, Timer timer) {
         if (ssidPw == null || ssidPw.ssid == null) {
             return null;
         }
@@ -80,6 +82,21 @@ public void onReceive(Context context, Intent intent) {
         activity.registerReceiver(connectReceiver, intentFilter);
         wifiManager.enableNetwork(netId, true);
         // wifiManager.reconnect();
+
+        Log.d(TAG, "Start timer");
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                Log.d(TAG, "Run timer");
+                if (activity != null && !activity.isFinishing()) {
+                    Intent failIntent = new Intent(activity, FailActivity.class);
+                    failIntent.putExtra("id", ssidPw.ssid);
+                    failIntent.putExtra("pw", ssidPw.pw);
+                    activity.startActivity(failIntent);
+                }
+            }
+        }, 3500);
+
         return connectReceiver;
     }
 }