From 2310c9564092fe0ae02f7fea1e436b647e8c1a7f Mon Sep 17 00:00:00 2001 From: Wilco Baan Hofman Date: Fri, 22 Dec 2023 14:15:10 +0100 Subject: [PATCH] Add 37c3 --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 4 ++-- .../java/nl/eventinfra/wifisetup/WifiSetup.java | 7 +++---- app/src/main/res/drawable-hdpi/ccc37c3logo.png | Bin 0 -> 9220 bytes app/src/main/res/layout/logon.xml | 4 ++-- app/src/main/res/values/strings.xml | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ccc37c3logo.png 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 0000000000000000000000000000000000000000..019f087c8f7a33f9f90160ffecb93bc274fc3d44 GIT binary patch literal 9220 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 literal 0 HcmV?d00001 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