Fix 35C3 sources

.gitignore

@@ -0,0 +1,5 @@
+.gradle
+.idea
+build
+app/build
+app/release

app/app.iml

@@ -88,6 +88,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -109,6 +110,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

app/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "nl.eventinfra.wifisetup"
         minSdkVersion 18
-        targetSdkVersion 21
+        targetSdkVersion 26
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

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

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";
+		subject_match = "/CN=radius.c3noc.net";
-		altsubject_match = "DNS:radius.emfcamp.org";
+		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_username = "35c3";
-			s_password = "emf";
+			s_password = "35c3";
 		} else {
 			if (s_username.contains("@")) {
 				int idx = s_username.indexOf("@");

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" />
 
 	<TextView
 		android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">EMF Camp Wifi Setup</string>
+	<string name="app_name">35C3 Wifi Setup</string>
 
 	<string name="TITLE_LOGON">Please logon</string>
 	<string name="Username">username@realm</string>
 	<string name="Password">password</string>
 	<string name="Logon">Create connection entry</string>
 
-	<string name="twitter">https://twitter.com/sha2017noc</string>
+	<string name="twitter">https://twitter.com/c3noc</string>
 
 	<string name="c5ghz">This device supports the 5GHz band</string>
 	<string name="l5ghz">(Unfortunately, autodetecting 5GHz support is broken&#8230;)</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">34C3 Logo (or EMF, whatever)</string>
+	<string name="LOGO">35C3 Logo</string>
 </resources>

gradlew.bat

@@ -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

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