PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow save by AddNetworkFragment itself

Browse Source 
Before this change, the calling Activity needs to
check result and get WifiConfiguration to save
data by WifiManager API.

This change allows callings app to specify an auto
save extra to save WifiConfiguration by
AddNetworkFragment itself.

Bug: 268411305
Test: manual
Change-Id: I83002c3de3d6726e9be363d5ac057b4ae9e1707e
This commit is contained in:
Arc Wang
2023-02-13 15:37:30 +08:00
parent 6f76d5dc91
commit da01d199c1
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/wifi/AddNetworkFragment.java
View File

@@ -20,6 +20,7 @@ import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -28,6 +29,7 @@ import android.view.WindowManager;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
@@ -51,6 +53,8 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
private static final String EXTRA_SAVE_WHEN_SUBMIT = ":settings:save_when_submit";
private WifiConfigController2 mUIController;
private Button mSubmitBtn;
private Button mCancelBtn;
@@ -196,11 +200,35 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
}
private void successfullyFinish(WifiConfiguration config) {
final Intent intent = new Intent();
final Activity activity = getActivity();
intent.putExtra(WIFI_CONFIG_KEY, config);
activity.setResult(Activity.RESULT_OK, intent);
activity.finish();
Activity activity = getActivity();
boolean autoSave = activity.getIntent().getBooleanExtra(EXTRA_SAVE_WHEN_SUBMIT, false);
if (autoSave && config != null) {
WifiManager.ActionListener saveListener = new WifiManager.ActionListener() {
@Override
public void onSuccess() {
if (activity != null && !activity.isFinishing()) {
activity.setResult(Activity.RESULT_OK);
activity.finish();
}
}
@Override
public void onFailure(int reason) {
if (activity != null && !activity.isFinishing()) {
Toast.makeText(activity, R.string.wifi_failed_save_message,
Toast.LENGTH_SHORT).show();
activity.finish();
}
}
};
activity.getSystemService(WifiManager.class).save(config, saveListener);
} else {
Intent intent = new Intent();
intent.putExtra(WIFI_CONFIG_KEY, config);
activity.setResult(Activity.RESULT_OK, intent);
activity.finish();
}
}
@VisibleForTesting