DGNum/wifisetup
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix target API version 30 (minimum for play store), 5G checkbox not required for EMF/MCH

Browse source
This commit is contained in:
Wilco Baan Hofman 2022-05-24 14:52:41 +02:00
parent 6baf5196f7
commit 2870b97b89
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -1,12 +1,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 28 compileSdkVersion 30
defaultConfig { defaultConfig {
applicationId "nl.eventinfra.wifisetup" applicationId "nl.eventinfra.wifisetup"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 28 targetSdkVersion 30
} }
buildTypes { buildTypes {

2
app/src/main/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nl.eventinfra.wifisetup" android:installLocation="auto" android:versionCode="20191205" android:versionName="0.31"> package="nl.eventinfra.wifisetup" android:installLocation="auto" android:versionCode="20220525" android:versionName="0.33">
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-feature android:name="android.hardware.wifi" android:required="true"/> <uses-feature android:name="android.hardware.wifi" android:required="true"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

14
app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
View file

@ -137,10 +137,10 @@ public class WifiSetup extends Activity {
username = (EditText) findViewById(R.id.username); username = (EditText) findViewById(R.id.username);
password = (EditText) findViewById(R.id.password); password = (EditText) findViewById(R.id.password);
/*
check5g = (CheckBox) findViewById(R.id.check5g); check5g = (CheckBox) findViewById(R.id.check5g);
check5g.setChecked(true); check5g.setChecked(true);
/*
TextView label5g = (TextView) findViewById(R.id.label5g); TextView label5g = (TextView) findViewById(R.id.label5g);
if (android.os.Build.VERSION.SDK_INT >= 21) { if (android.os.Build.VERSION.SDK_INT >= 21) {
check5g.setChecked(get5G()); check5g.setChecked(get5G());
@ -273,13 +273,15 @@ public class WifiSetup extends Activity {
StoreWifiProfile(ssid, subject_match, altsubject_match, s_username, s_password); StoreWifiProfile(ssid, subject_match, altsubject_match, s_username, s_password);
// MCH2022 // MCH2022
if (check5g.isChecked()) {
/*if (check5g.isChecked()) {
ssid = "MCH2022"; ssid = "MCH2022";
} else { } else {
ssid = "MCH2022-legacy"; ssid = "MCH2022-legacy";
} }*/
subject_match = "/CN=radius.mch2022.nl"; ssid = "MCH2022";
altsubject_match = "DNS:radius.mch2022.nl"; subject_match = "/CN=radius.mch2022.org";
altsubject_match = "DNS:radius.mch2022.org";
realm = ""; realm = "";
switch (selected_profile) { switch (selected_profile) {