diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..55c1d09
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.gradle
+.idea
+build
+app/build
+app/release
diff --git a/app/app.iml b/app/app.iml
index 71aaa90..2430dd5 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -88,6 +88,7 @@
+
@@ -109,6 +110,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index b167b21..e1ab97c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
defaultConfig {
applicationId "nl.eventinfra.wifisetup"
minSdkVersion 18
- targetSdkVersion 21
+ targetSdkVersion 26
}
buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d32cf52..4f18b8c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="nl.eventinfra.wifisetup" android:installLocation="auto" android:versionCode="20181222" android:versionName="0.25">
diff --git a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
index ea3e540..0099dec 100644
--- a/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
+++ b/app/src/main/java/nl/eventinfra/wifisetup/WifiSetup.java
@@ -233,19 +233,19 @@ public class WifiSetup extends Activity {
}
if (check5g.isChecked()) {
- ssid = "emfcamp";
+ ssid = "35C3";
} else {
- ssid = "emfcamp-legacy18";
+ ssid = "35C3-legacy";
}
- subject_match = "/CN=radius.emfcamp.org";
- altsubject_match = "DNS:radius.emfcamp.org";
+ subject_match = "/CN=radius.c3noc.net";
+ altsubject_match = "DNS:radius.c3noc.net";
s_username = username.getText().toString();
s_password = password.getText().toString();
realm = "";
if (s_username.equals("") && s_password.equals("")) {
- s_username = "emf";
- s_password = "emf";
+ s_username = "35c3";
+ s_password = "35c3";
} else {
if (s_username.contains("@")) {
int idx = s_username.indexOf("@");
diff --git a/app/src/main/res/drawable-hdpi/ccc35c3logo.png b/app/src/main/res/drawable-hdpi/ccc35c3logo.png
new file mode 100644
index 0000000..93bd83e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ccc35c3logo.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
index f643ee2..8a12ea0 100644
Binary files a/app/src/main/res/drawable-hdpi/icon.png and b/app/src/main/res/drawable-hdpi/icon.png differ
diff --git a/app/src/main/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png
index e85b9c1..6739f9a 100644
Binary files a/app/src/main/res/drawable-ldpi/icon.png and b/app/src/main/res/drawable-ldpi/icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
index 1e3a5bc..6739f9a 100644
Binary files a/app/src/main/res/drawable-mdpi/icon.png and b/app/src/main/res/drawable-mdpi/icon.png differ
diff --git a/app/src/main/res/layout/logon.xml b/app/src/main/res/layout/logon.xml
index 9878fda..a8b961b 100644
--- a/app/src/main/res/layout/logon.xml
+++ b/app/src/main/res/layout/logon.xml
@@ -27,7 +27,7 @@
android:contentDescription="@string/LOGO"
android:padding="0dp"
android:scaleType="fitCenter"
- android:src="@drawable/emflogo" />
+ android:src="@drawable/ccc35c3logo" />
- EMF Camp Wifi Setup
+ 35C3 Wifi Setup
Please logon
username@realm
password
Create connection entry
- https://twitter.com/sha2017noc
+ https://twitter.com/c3noc
This device supports the 5GHz band
(Unfortunately, autodetecting 5GHz support is broken…)
@@ -18,5 +18,5 @@
Exit
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.
- 34C3 Logo (or EMF, whatever)
+ 35C3 Logo
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..3b94d2e
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,12 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Dec 22 13:13:03 CET 2017
+ndk.dir=/home/wilco/Android/Sdk/ndk-bundle
+sdk.dir=/home/wilco/Android/Sdk