Merge "Fix "Add Network" button on SavedAccessPoints page."

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

@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import android.annotation.Nullable;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.icu.text.Collator;
@@ -28,6 +29,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
+import android.widget.Toast;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -88,6 +90,22 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         }
     };
 
+    private final WifiManager.ActionListener mSaveListener = new WifiManager.ActionListener() {
+        @Override
+        public void onSuccess() {
+            postUpdatePreference();
+        }
+        @Override
+        public void onFailure(int reason) {
+            Activity activity = getActivity();
+            if (activity != null) {
+                Toast.makeText(activity,
+                    R.string.wifi_failed_save_message,
+                    Toast.LENGTH_SHORT).show();
+            }
+        }
+    };
+
     private WifiDialog mDialog;
     private WifiManagerWrapper mWifiManager;
     private AccessPoint mDlgAccessPoint;
@@ -267,7 +285,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
 
     @Override
     public void onSubmit(WifiDialog dialog) {
-        // Ignored
+        mWifiManager.save(dialog.getController().getConfig(), mSaveListener);
     }
 
     @Override

src/com/android/settings/wrapper/WifiManagerWrapper.java

@@ -1,5 +1,6 @@
 package com.android.settings.wrapper;
 
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 
 /**
@@ -37,9 +38,16 @@ public class WifiManagerWrapper {
     }
 
     /**
-     * {@link WifiManager#removePasspointConfiguration}
+     * {@link WifiManager#forget}
      */
     public void forget(int netId, WifiManager.ActionListener listener) {
         mWifiManager.forget(netId, listener);
     }
+
+    /**
+     * {@link WifiManager#save}
+     */
+    public void save(WifiConfiguration config, WifiManager.ActionListener listener) {
+        mWifiManager.save(config, listener);
+    }
 }

tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java

@@ -16,31 +16,36 @@
 
 package com.android.settings.wifi;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager.ActionListener;
 import android.os.Handler;
-
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedAccessPointsWifiSettingsTest {
 
-    @Mock
-    private Handler mHandler;
+    @Mock private WifiManagerWrapper mockWifiManager;
+    @Mock private WifiDialog mockWifiDialog;
+    @Mock private WifiConfigController mockConfigController;
+    @Mock private WifiConfiguration mockWifiConfiguration;
+    @Mock private AccessPoint mockAccessPoint;
+    @Mock private Handler mHandler;
 
     private SavedAccessPointsWifiSettings mSettings;
 
@@ -49,6 +54,10 @@ public class SavedAccessPointsWifiSettingsTest {
         MockitoAnnotations.initMocks(this);
         mSettings = new SavedAccessPointsWifiSettings();
         ReflectionHelpers.setField(mSettings, "mHandler", mHandler);
+        ReflectionHelpers.setField(mSettings, "mWifiManager", mockWifiManager);
+
+        when(mockWifiDialog.getController()).thenReturn(mockConfigController);
+        when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
     }
 
     @Test
@@ -56,7 +65,6 @@ public class SavedAccessPointsWifiSettingsTest {
         final AccessPoint accessPoint = mock(AccessPoint.class);
         when(accessPoint.isPasspointConfig()).thenReturn(true);
         ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", accessPoint);
-        ReflectionHelpers.setField(mSettings, "mWifiManager", mock(WifiManagerWrapper.class));
 
         mSettings.onForget(null);
 
@@ -76,4 +84,18 @@ public class SavedAccessPointsWifiSettingsTest {
 
         verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
     }
+
+    @Test
+    public void onSubmit_shouldInvokeSaveApi() {
+        mSettings.onSubmit(mockWifiDialog);
+        verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
+    }
+    @Test
+    public void onForget_shouldInvokeForgetApi() {
+        ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mockAccessPoint);
+        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
+        mSettings.onForget(mockWifiDialog);
+        verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+    }
 }
+