From c4a0abef8ccb476f54cd04d4b041feb0446d9026 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 3 Aug 2023 13:46:27 +0000 Subject: [PATCH] Revert "Clean up unused WifiManager.ActionListener" This reverts commit a2adee5362266ad2723009904ffde9139ff77dcc. Reason for revert: Breaks build - b/294364808 Change-Id: I4f323c2fc43dddbf2f2dd0e323f026727263c99e --- res/values/strings.xml | 2 + .../network/NetworkProviderSettings.java | 21 ++++++++ .../settings/wifi/WifiConnectListener.java | 48 +++++++++++++++++++ .../android/settings/wifi/WifiSettings.java | 20 ++++++++ 4 files changed, 91 insertions(+) create mode 100644 src/com/android/settings/wifi/WifiConnectListener.java diff --git a/res/values/strings.xml b/res/values/strings.xml index f2f10d2a307..08632498e69 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1953,6 +1953,8 @@ Forget Modify + + Failed to forget network Save diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index acb79cc23c3..e285a91090d 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -74,6 +74,7 @@ import com.android.settings.wifi.ConfigureWifiEntryFragment; import com.android.settings.wifi.ConnectedWifiEntryPreference; import com.android.settings.wifi.LongPressWifiEntryPreference; import com.android.settings.wifi.WifiConfigUiBase2; +import com.android.settings.wifi.WifiConnectListener; import com.android.settings.wifi.WifiDialog2; import com.android.settings.wifi.WifiPickerTrackerHelper; import com.android.settings.wifi.WifiUtils; @@ -198,7 +199,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment }; protected WifiManager mWifiManager; + private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mSaveListener; + private WifiManager.ActionListener mForgetListener; protected InternetResetHelper mInternetResetHelper; @@ -404,6 +407,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment } mInternetUpdater = new InternetUpdater(getContext(), getSettingsLifecycle(), this); + mConnectListener = new WifiConnectListener(getActivity()); + mSaveListener = new WifiManager.ActionListener() { @Override public void onSuccess() { @@ -419,6 +424,22 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment } } }; + + mForgetListener = new WifiManager.ActionListener() { + @Override + public void onSuccess() { + } + + @Override + public void onFailure(int reason) { + Activity activity = getActivity(); + if (activity != null) { + Toast.makeText(activity, + R.string.wifi_failed_forget_message, + Toast.LENGTH_SHORT).show(); + } + } + }; setHasOptionsMenu(true); if (savedInstanceState != null) { diff --git a/src/com/android/settings/wifi/WifiConnectListener.java b/src/com/android/settings/wifi/WifiConnectListener.java new file mode 100644 index 00000000000..b97fbc5e6e4 --- /dev/null +++ b/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(); + } + } +} diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ded01dd9b7a..2a166645f18 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -59,6 +59,7 @@ import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; import com.android.settings.SettingsActivity; +import com.android.settings.Utils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.DataUsagePreference; @@ -174,7 +175,9 @@ public class WifiSettings extends RestrictedSettingsFragment }; protected WifiManager mWifiManager; + private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mSaveListener; + private WifiManager.ActionListener mForgetListener; /** * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to @@ -307,6 +310,8 @@ public class WifiSettings extends RestrictedSettingsFragment mWifiManager = getActivity().getSystemService(WifiManager.class); } + mConnectListener = new WifiConnectListener(getActivity()); + mSaveListener = new WifiManager.ActionListener() { @Override public void onSuccess() { @@ -323,6 +328,21 @@ public class WifiSettings extends RestrictedSettingsFragment } }; + mForgetListener = new WifiManager.ActionListener() { + @Override + public void onSuccess() { + } + + @Override + public void onFailure(int reason) { + Activity activity = getActivity(); + if (activity != null) { + Toast.makeText(activity, + R.string.wifi_failed_forget_message, + Toast.LENGTH_SHORT).show(); + } + } + }; registerForContextMenu(getListView()); setHasOptionsMenu(true);