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

Add 37c3

Browse source
This commit is contained in:
Wilco Baan Hofman 2023-12-22 14:15:10 +01:00
parent b42a127f47
commit 2310c95640
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -6,7 +6,7 @@ android {
defaultConfig { defaultConfig {
applicationId "nl.eventinfra.wifisetup" applicationId "nl.eventinfra.wifisetup"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 31 targetSdkVersion 33
} }
buildTypes { buildTypes {

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

@ -2,8 +2,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" package="nl.eventinfra.wifisetup"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="20230804" android:versionCode="20231222"
android:versionName="0.36"> android:versionName="0.37">
<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" />

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

@ -280,14 +280,13 @@ 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);
*/ */
// CCC Camp2023
/*if (check5g.isChecked()) { /*if (check5g.isChecked()) {
ssid = "MCH2022"; ssid = "MCH2022";
} else { } else {
ssid = "MCH2022-legacy"; ssid = "MCH2022-legacy";
}*/ }*/
ssid = "Camp2023"; ssid = "37C3";
subject_match = "/CN=radius.c3noc.net"; subject_match = "/CN=radius.c3noc.net";
altsubject_match = "DNS:radius.c3noc.net"; altsubject_match = "DNS:radius.c3noc.net";
@ -298,8 +297,8 @@ public class WifiSetup extends Activity {
s_password = "allowany"; s_password = "allowany";
break; break;
case PROFILE_SITEONLY: case PROFILE_SITEONLY:
s_username = "camp"; s_username = "37c3";
s_password = "camp"; s_password = "37c3";
break; break;
case PROFILE_PROTECTME: case PROFILE_PROTECTME:
s_username = "outboundonly"; s_username = "outboundonly";

BIN
app/src/main/res/drawable-hdpi/ccc37c3logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9 KiB

4
app/src/main/res/layout/logon.xml
View file

@ -24,10 +24,10 @@
android:id="@+id/logo" android:id="@+id/logo"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:contentDescription="CCCamp23 logo" android:contentDescription="37C3 logo"
android:padding="0dp" android:padding="0dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/camp23logo" /> android:src="@drawable/ccc37c3logo" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
app/src/main/res/values/strings.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">CCCamp 2023 Wifi Setup</string> <string name="app_name">37C3 Wifi Setup</string>
<string name="TITLE_LOGON">Please logon</string> <string name="TITLE_LOGON">Please logon</string>
<string name="Username">username@realm</string> <string name="Username">username@realm</string>