diff --git a/app/build.gradle b/app/build.gradle index 270cd12..d58fcaf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "nl.eventinfra.wifisetup" minSdkVersion 18 - targetSdkVersion 31 + targetSdkVersion 33 } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8129bf9..380f877 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="20231222" + android:versionName="0.37"> diff --git a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java index 158cd33..4a942ad 100644 --- a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java +++ b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java @@ -280,14 +280,13 @@ public class WifiSetup extends Activity { } StoreWifiProfile(ssid, subject_match, altsubject_match, s_username, s_password); */ - // CCC Camp2023 /*if (check5g.isChecked()) { ssid = "MCH2022"; } else { ssid = "MCH2022-legacy"; }*/ - ssid = "Camp2023"; + ssid = "37C3"; subject_match = "/CN=radius.c3noc.net"; altsubject_match = "DNS:radius.c3noc.net"; @@ -298,8 +297,8 @@ public class WifiSetup extends Activity { s_password = "allowany"; break; case PROFILE_SITEONLY: - s_username = "camp"; - s_password = "camp"; + s_username = "37c3"; + s_password = "37c3"; break; case PROFILE_PROTECTME: s_username = "outboundonly"; diff --git a/app/src/main/res/drawable-hdpi/ccc37c3logo.png b/app/src/main/res/drawable-hdpi/ccc37c3logo.png new file mode 100644 index 0000000..019f087 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ccc37c3logo.png differ diff --git a/app/src/main/res/layout/logon.xml b/app/src/main/res/layout/logon.xml index 8e2fa6a..32dfa45 100644 --- a/app/src/main/res/layout/logon.xml +++ b/app/src/main/res/layout/logon.xml @@ -24,10 +24,10 @@ android:id="@+id/logo" android:layout_width="fill_parent" android:layout_height="200dp" - android:contentDescription="CCCamp23 logo" + android:contentDescription="37C3 logo" android:padding="0dp" android:scaleType="fitCenter" - android:src="@drawable/camp23logo" /> + android:src="@drawable/ccc37c3logo" /> - CCCamp 2023 Wifi Setup + 37C3 Wifi Setup Please logon username@realm