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

Update for CCC Camp 2019

Browse source
This commit is contained in:
Wilco Baan Hofman 2019-08-13 10:43:32 +02:00
parent 867323075f
commit 21e5605ec9
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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="20181222" android:versionName="0.25">
package="nl.eventinfra.wifisetup" android:installLocation="auto" android:versionCode="20190813" android:versionName="0.26">
<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" />

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

@ -233,9 +233,9 @@ public class WifiSetup extends Activity {
}
if (check5g.isChecked()) {
ssid = "35C3";
ssid = "Camp2019";
} else {
ssid = "35C3-legacy";
ssid = "Camp2019-legacy";
}
subject_match = "/CN=radius.c3noc.net";
altsubject_match = "DNS:radius.c3noc.net";
@ -244,8 +244,8 @@ public class WifiSetup extends Activity {
s_password = password.getText().toString();
realm = "";
if (s_username.equals("") && s_password.equals("")) {
s_username = "35c3";
s_password = "35c3";
s_username = "Camp2019";
s_password = "Camp2019";
} else {
if (s_username.contains("@")) {
int idx = s_username.indexOf("@");

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

@ -27,7 +27,7 @@
android:contentDescription="@string/LOGO"
android:padding="0dp"
android:scaleType="fitCenter"
android:src="@drawable/ccc35c3logo" />
android:src="@drawable/camp19logo" />
<TextView
android:layout_width="wrap_content"

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">35C3 Wifi Setup</string>
<string name="app_name">CCC Camp 2019 Wifi Setup</string>
<string name="TITLE_LOGON">Please logon</string>
<string name="Username">username@realm</string>
@ -18,5 +18,5 @@
<string name="EXIT_TITLE">Exit</string>
<string name="ABOUT_CONTENT">This small helper app creates a Wifi connection entry for the CCC/EMF/SHA2017 networks. It configures the correct SSL CA and subject name match, making it a little more secure than a hand-created entry.</string>
<string name="LOGO">35C3 Logo</string>
<string name="LOGO">Camp2019 Logo</string>
</resources>