From 2870b97b890ba99a66d3fd9df15fd86d91857e26 Mon Sep 17 00:00:00 2001
From: Wilco Baan Hofman <wilco@baanhofman.nl>
Date: Tue, 24 May 2022 14:52:41 +0200
Subject: [PATCH] Fix target API version 30 (minimum for play store), 5G
 checkbox not required for EMF/MCH

---
 app/build.gradle                                   |  4 ++--
 app/src/main/AndroidManifest.xml                   |  2 +-
 .../java/nl/eventinfra/wifisetup/WifiSetup.java    | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8cb68f9..d58a08c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "nl.eventinfra.wifisetup"
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 30
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 444930a..3377c18 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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.wifi" android:required="true"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
index 5899ba7..7ff70d9 100644
--- a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
+++ b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
@@ -137,10 +137,10 @@ public class WifiSetup extends Activity {
 		username = (EditText) findViewById(R.id.username);
 		password = (EditText) findViewById(R.id.password);
 
-
+		/*
 		check5g = (CheckBox) findViewById(R.id.check5g);
 		check5g.setChecked(true);
-		/*
+
 		TextView label5g = (TextView) findViewById(R.id.label5g);
 		if (android.os.Build.VERSION.SDK_INT >= 21) {
 			check5g.setChecked(get5G());
@@ -273,13 +273,15 @@ public class WifiSetup extends Activity {
 		StoreWifiProfile(ssid, subject_match, altsubject_match, s_username, s_password);
 
         // MCH2022
-		if (check5g.isChecked()) {
+
+		/*if (check5g.isChecked()) {
 			ssid = "MCH2022";
 		} else {
 			ssid = "MCH2022-legacy";
-		}
-		subject_match = "/CN=radius.mch2022.nl";
-		altsubject_match = "DNS:radius.mch2022.nl";
+		}*/
+		ssid = "MCH2022";
+		subject_match = "/CN=radius.mch2022.org";
+		altsubject_match = "DNS:radius.mch2022.org";
 
 		realm = "";
 		switch (selected_profile) {