Add Wi-Fi connect listener in ConnectToWifiHandler

- Extract the connect listener from WifiSettings
- Add a listener to display a toast on failure to connect in ConnectToWifiHandler
- Also for the new AccessPoint.startOsuProvisioning() which accepts a connect listener

Bug: 123697580
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I29b2c1e2c58312d692675ecabf2818b4bbed3b51

src/com/android/settings/wifi/WifiConnectListener.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.widget.Toast;
+
+import com.android.settings.R;
+
+/**
+ *  A listener to display a toast on failure to connect
+ */
+public class WifiConnectListener implements WifiManager.ActionListener {
+
+    private final Context mContext;
+
+    public WifiConnectListener(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public void onSuccess() {
+    }
+
+    @Override
+    public void onFailure(int reason) {
+        if (mContext != null) {
+            Toast.makeText(mContext,
+                    R.string.wifi_failed_connect_message,
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+}

src/com/android/settings/wifi/WifiSettings.java

@@ -258,21 +258,7 @@ public class WifiSettings extends RestrictedSettingsFragment
             mConnectivityManager = getActivity().getSystemService(ConnectivityManager.class);
         }
 
-        mConnectListener = new WifiManager.ActionListener() {
+        mConnectListener = new WifiConnectListener(getActivity());
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_connect_message,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
 
         mSaveListener = new WifiManager.ActionListener() {
             @Override

src/com/android/settings/wifi/slice/ConnectToWifiHandler.java

@@ -22,6 +22,7 @@ import android.os.Bundle;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.wifi.WifiConnectListener;
 import com.android.settings.wifi.WifiDialogActivity;
 import com.android.settings.wifi.WifiUtils;
 import com.android.settingslib.wifi.AccessPoint;
@@ -46,9 +47,10 @@ public class ConnectToWifiHandler extends Activity {
 
     @VisibleForTesting
     void connect(AccessPoint accessPoint) {
+        final WifiConnectListener connectListener = new WifiConnectListener(this);
         switch (WifiUtils.getConnectingType(accessPoint)) {
             case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
-                accessPoint.startOsuProvisioning(null /* listener */);
+                accessPoint.startOsuProvisioning(connectListener);
                 break;
 
             case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
@@ -56,7 +58,7 @@ public class ConnectToWifiHandler extends Activity {
 
             case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
                 final WifiManager wifiManager = getSystemService(WifiManager.class);
-                wifiManager.connect(accessPoint.getConfig(), null /* listener */);
+                wifiManager.connect(accessPoint.getConfig(), connectListener);
                 break;
         }
     }

tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java

@@ -18,12 +18,14 @@ package com.android.settings.wifi.slice;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
+import android.net.wifi.WifiManager;
 
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settings.testutils.shadow.ShadowWifiManager;
@@ -78,7 +80,7 @@ public class ConnectToWifiHandlerTest {
 
         mHandler.connect(mAccessPoint);
 
-        verify(mAccessPoint).startOsuProvisioning(null /* listener */);
+        verify(mAccessPoint).startOsuProvisioning(any(WifiManager.ActionListener.class));
     }