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

wifi: Using framework uri parsing

Browse Source 
Bug: 298669190
Test: Manual test. Qr code sacnning works normally.
Change-Id: I8e6138971ae6798b42db32930f80e9113a8c0223
This commit is contained in:
Les Lee
2024-03-22 05:11:08 +00:00
parent a9f137842a
commit 1635951de2
5 changed files with 65 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/dpp/AdbQrCode.java
View File

@@ -16,8 +16,12 @@
package com.android.settings.wifi.dpp;
import android.content.Context;
import android.net.wifi.UriParserResults;
import android.net.wifi.WifiConfiguration;
import android.text.TextUtils;
import androidx.annotation.NonNull;
/**
* Extension of WifiQrCode to support ADB QR code format.
* It will be based on the ZXing format:
@@ -27,31 +31,31 @@ import android.text.TextUtils;
public class AdbQrCode extends WifiQrCode {
static final String SECURITY_ADB = "ADB";
private WifiNetworkConfig mAdbConfig;
private WifiConfiguration mAdbConfig;
public AdbQrCode(String qrCode) throws IllegalArgumentException {
super(qrCode);
// Only accept the zxing format.
if (!WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(getScheme())) {
if (getScheme() != UriParserResults.URI_SCHEME_ZXING_WIFI_NETWORK_CONFIG) {
throw new IllegalArgumentException("DPP format not supported for ADB QR code");
}
mAdbConfig = getWifiConfiguration();
mAdbConfig = getWifiNetworkConfig();
if (!SECURITY_ADB.equals(mAdbConfig.getSecurity())) {
throw new IllegalArgumentException("Invalid security type");
if (mAdbConfig == null) {
throw new IllegalArgumentException("Null config when parsing ADB QR code");
}
if (TextUtils.isEmpty(mAdbConfig.getSsid())) {
if (TextUtils.isEmpty(mAdbConfig.SSID)) {
throw new IllegalArgumentException("Empty service name");
}
if (TextUtils.isEmpty(mAdbConfig.getPreSharedKey())) {
if (TextUtils.isEmpty(mAdbConfig.preSharedKey)) {
throw new IllegalArgumentException("Empty password");
}
}
public WifiNetworkConfig getAdbNetworkConfig() {
@NonNull
public WifiConfiguration getAdbNetworkConfig() {
return mAdbConfig;
}