From 761fbdcbecd50236a5e8e653c27327b653b3ccf9 Mon Sep 17 00:00:00 2001
From: Nick <handnf@gmail.com>
Date: Thu, 27 Oct 2016 20:57:53 -0400
Subject: [PATCH 1/4] Added extended EnterpriseWifi class

---
 .../qrgen/core/scheme/EnterpriseWifi.java     | 121 ++++++++++++++++++
 .../java/net/glxn/qrgen/core/scheme/Wifi.java |  18 +--
 2 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java

diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
new file mode 100644
index 0000000..a9ec9ef
--- /dev/null
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
@@ -0,0 +1,121 @@
+package net.glxn.qrgen.core.scheme;
+
+import java.util.Map;
+
+import static net.glxn.qrgen.core.scheme.SchemeUtil.getParameters;
+
+/**
+ * Encodes a Wifi connection, format is:
+ * <code>WIFI:S:SSID;U:USER;P:PSK;E:EAP;PH:PHASE;;</code>
+ */
+public class EnterpriseWifi extends Wifi {
+
+    private static final String USER = "U";
+    private static final String EAP = "E";
+    private static final String PHASE = "PH";
+    private String username;
+    private String eap;
+    private String phase;
+    private boolean hidden = false;
+    public EnterpriseWifi() {
+    }
+
+    public static EnterpriseWifi parse(final String wifiCode) {
+        if (wifiCode == null || !wifiCode.startsWith(WIFI_PROTOCOL_HEADER)) {
+            throw new IllegalArgumentException(
+                    "this is not a valid WIFI code: " + wifiCode);
+        }
+        Wifi wifi = new Wifi();
+        Map<String, String> parameters = getParameters(
+                wifiCode.substring(WIFI_PROTOCOL_HEADER.length()), "(?<!\\\\);");
+        if (parameters.containsKey(SSID)) {
+            wifi.setSsid(unescape(parameters.get(SSID)));
+        }
+        if (parameters.containsKey(PSK)) {
+            wifi.setPsk(unescape(parameters.get(PSK)));
+        }
+        if (parameters.containsKey(USER)) {
+            wifi.setUser(unescape(parameters.get(USER)));
+        }
+        if (parameters.containsKey(EAP)) {
+            wifi.setEap(unescape(parameters.get(EAP)));
+        }
+        if (parameters.containsKey(PHASE)) {
+            wifi.setPhase(unescape(parameters.get(PHASE)));
+        }
+        return wifi;
+    }
+
+    public static String escape(final String text) {
+        return text.replace("\\", "\\\\").replace(",", "\\,")
+                .replace(";", "\\;").replace(".", "\\.")
+                .replace("\"", "\\\"").replace("'", "\\'");
+    }
+
+    public static String unescape(final String text) {
+        return text.replace("\\\\", "\\").replace("\\,", ",")
+                .replace("\\;", ";").replace("\\.", ".")
+                .replace("\\\"", "\"").replace("\\'", "'");
+    }
+
+    public EnterpriseWifi withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public EnterpriseWifi setUsername(String username) {
+        withUsername(username);
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public EnterpriseWifi withEap(Strin eap) {
+        this.eap = eap;
+        return this;
+    }
+
+    public EnterpriseWifi setEap(String eap) {
+        withEap(eap);
+    }
+
+    public String getEap() {
+        return eap;
+    }
+
+    public EnterpriseWifi withPhase(String phase) {
+        this.phase = phase;
+        return this;
+    }
+
+    public void setPhase(String phase) {
+        withPhase(phase);
+    }
+
+    public String getPhase() {
+        return phase;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bob = new StringBuilder(WIFI_PROTOCOL_HEADER);
+        if (getSsid() != null) {
+            bob.append(SSID).append(":").append(escape(getSsid())).append(";");
+        }
+        if (getUsername() != null) {
+            bob.append(USER).append(":").append(getUsername()).append(";");
+        }
+        if (getPsk() != null) {
+            bob.append(PSK).append(":").append(escape(getPsk())).append(";");
+        }
+        if (getEap() != null) {
+            bob.append(EAP).append(":").append(escape(getEap())).append(";");
+        }
+        if (getPhase() != null) {
+            bob.append(PHASE).append(":").append(escape(getPhase())).append(";");
+        }
+        bob.append(HIDDEN).append(":").append(isHidden()).append(";");
+        return bob.toString();
+    }
+}
diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
index 16c8254..d4f1863 100644
--- a/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
@@ -10,15 +10,15 @@
  */
 public class Wifi {
 
-	private static final String WIFI_PROTOCOL_HEADER = "WIFI:";
-	private static final String AUTHENTICATION = "T";
-	private static final String SSID = "S";
-	private static final String PSK = "P";
-	private static final String HIDDEN = "H";
-	private String authentication;
-	private String ssid;
-	private String psk;
-	private boolean hidden = false;
+	protected static final String WIFI_PROTOCOL_HEADER = "WIFI:";
+	protected static final String AUTHENTICATION = "T";
+	protected static final String SSID = "S";
+	protected static final String PSK = "P";
+	protected static final String HIDDEN = "H";
+	protected String authentication;
+	protected String ssid;
+	protected String psk;
+	protected boolean hidden = false;
 	public Wifi() {
 	}
 

From 19e4e8a3916bc41c3ad1c11b98186910afcf0a20 Mon Sep 17 00:00:00 2001
From: Nick <handnf@gmail.com>
Date: Sat, 29 Oct 2016 16:09:18 -0400
Subject: [PATCH 2/4] Fixed syntax errors, wrote unit test

---
 .../qrgen/core/scheme/EnterpriseWifi.java     |  4 +-
 .../qrgen/core/scheme/EnterpriseWifiTest.java | 90 +++++++++++++++++++
 2 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java

diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
index a9ec9ef..502d18a 100644
--- a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
@@ -25,7 +25,7 @@ public static EnterpriseWifi parse(final String wifiCode) {
             throw new IllegalArgumentException(
                     "this is not a valid WIFI code: " + wifiCode);
         }
-        Wifi wifi = new Wifi();
+        EnterpriseWifi wifi = new EnterpriseWifi();
         Map<String, String> parameters = getParameters(
                 wifiCode.substring(WIFI_PROTOCOL_HEADER.length()), "(?<!\\\\);");
         if (parameters.containsKey(SSID)) {
@@ -71,7 +71,7 @@ public String getUsername() {
         return username;
     }
 
-    public EnterpriseWifi withEap(Strin eap) {
+    public EnterpriseWifi withEap(String eap) {
         this.eap = eap;
         return this;
     }
diff --git a/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java b/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java
new file mode 100644
index 0000000..851eabb
--- /dev/null
+++ b/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java
@@ -0,0 +1,90 @@
+package net.glxn.qrgen.core.scheme;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import net.glxn.qrgen.core.scheme.Wifi.Authentication;
+
+import org.junit.Test;
+
+public class EnterpriseWifiTest {
+
+    @Test
+    public void parse() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse(
+                "WIFI:S:some weird SSID;U:Spock;P:aintNoSecret;E:PEAP;PH:MS-CHAPv2;H:true;");
+        assertEquals("some weird SSID", wifi.getSsid());
+        assertEquals("Spock", wifi.getUser());
+        assertEquals("aintNoSecret", wifi.getPsk());
+        assertEquals("PEAP", wifi.getEap());
+        assertEquals("MS-CHAPv2", wifi.getPhase());
+        assertEquals(true, wifi.isHidden());
+    }
+
+    /**
+     * The following characters need to be escaped with a backslash (\) in the
+     * SSID and PSK strings: backslash (\), single-quote ('), double-quote ("),
+     * dot (.), colon (:), comma (,), and semicolon (;)
+     */
+    @Test
+    public void parseEscapeSsidAndAuth() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse(
+                "WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;U:Sp\\;ock;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;E:PEAP;PH:MS-CHAPv2;false;");
+
+        assertEquals("s;o,\"me 'wei\\rd. SSID;", wifi.getSsid());
+        assertEquals("Sp;ock", wifi.getUser());
+        assertEquals(";a,\"intNo,Sec\\ret", wifi.getPsk());
+        assertEquals("PEAP", wifi.getEap());
+        assertEquals("MS-CHAPv2", wifi.getPhase());
+        assertEquals(false, wifi.isHidden());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void parseNull() {
+        EnterpriseWifi.parse(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void parseEmptyString() {
+        EnterpriseWifi.parse("");
+    }
+
+    @Test
+    public void parseHeaderOnly() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse("WIFI:");
+        assertNull(null, wifi.getSsid());
+        assertNull(null, wifi.getUser());
+        assertNull(null, wifi.getPsk());
+        assertNull(null, wifi.getEap());
+        assertNull(null, wifi.getPhase());
+        assertEquals(false, wifi.isHidden());
+    }
+
+    @Test
+    public void testToString() {
+        EnterpriseWifi wifi = new EnterpriseWifi();
+        wifi.setSsid("some weird SSID");
+        wifi.setUser("Spock");
+        wifi.setPsk("aintNoSecret");
+        wifi.setEap("PEAP");
+        wifi.setPhase("MS-CHAPv2");
+        wifi.setHidden(true);
+
+        assertEquals("WIFI:S:some weird SSID;U:Spcok;P:aintNoSecret;E:PEAP;PH:MS-CHAPv2;H:true;",
+                wifi.toString());
+    }
+
+    @Test
+    public void testToStringEscapeUsernameAndPassword() {
+        EnterpriseWifi wifi = new EnterpriseWifi();
+        wifi.setSsid("s;o,\"me 'wei\\rd. SSID;");
+        wifi.setUser("Sp;ock");
+        wifi.setPsk(";a,\"intNo,Sec\\ret");
+        wifi.setEap("PEAP");
+        wifi.setPhase("MS-CHAPv2");
+        wifi.setHidden(false);
+
+        assertEquals("WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;U:Sp\\;ock;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;E:PEAP;PH:MS-CHAPv2;H:false;",
+                wifi.toString());
+    }
+
+}

From a9c2cd1ab690e4e49a24f6dfc31280b8bbb352c5 Mon Sep 17 00:00:00 2001
From: Nick <handnf@gmail.com>
Date: Sat, 29 Oct 2016 16:09:18 -0400
Subject: [PATCH 3/4] Fixed syntax errors, wrote unit test

---
 .../qrgen/core/scheme/EnterpriseWifi.java     | 24 ++---
 .../qrgen/core/scheme/EnterpriseWifiTest.java | 90 +++++++++++++++++++
 .../net/glxn/qrgen/core/scheme/WifiTest.java  | 12 ++-
 3 files changed, 112 insertions(+), 14 deletions(-)
 create mode 100644 core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java

diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
index a9ec9ef..8e4c797 100644
--- a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
@@ -9,14 +9,14 @@
  * <code>WIFI:S:SSID;U:USER;P:PSK;E:EAP;PH:PHASE;;</code>
  */
 public class EnterpriseWifi extends Wifi {
-
     private static final String USER = "U";
     private static final String EAP = "E";
     private static final String PHASE = "PH";
-    private String username;
+    private String user;
     private String eap;
     private String phase;
     private boolean hidden = false;
+
     public EnterpriseWifi() {
     }
 
@@ -25,7 +25,7 @@ public static EnterpriseWifi parse(final String wifiCode) {
             throw new IllegalArgumentException(
                     "this is not a valid WIFI code: " + wifiCode);
         }
-        Wifi wifi = new Wifi();
+        EnterpriseWifi wifi = new EnterpriseWifi();
         Map<String, String> parameters = getParameters(
                 wifiCode.substring(WIFI_PROTOCOL_HEADER.length()), "(?<!\\\\);");
         if (parameters.containsKey(SSID)) {
@@ -58,20 +58,20 @@ public static String unescape(final String text) {
                 .replace("\\\"", "\"").replace("\\'", "'");
     }
 
-    public EnterpriseWifi withUsername(String username) {
-        this.username = username;
+    public EnterpriseWifi withUser(String user) {
+        this.user = user;
         return this;
     }
 
-    public EnterpriseWifi setUsername(String username) {
-        withUsername(username);
+    public EnterpriseWifi setUser(String user) {
+        withUser(user);
     }
 
-    public String getUsername() {
-        return username;
+    public String getUser() {
+        return user;
     }
 
-    public EnterpriseWifi withEap(Strin eap) {
+    public EnterpriseWifi withEap(String eap) {
         this.eap = eap;
         return this;
     }
@@ -103,8 +103,8 @@ public String toString() {
         if (getSsid() != null) {
             bob.append(SSID).append(":").append(escape(getSsid())).append(";");
         }
-        if (getUsername() != null) {
-            bob.append(USER).append(":").append(getUsername()).append(";");
+        if (getUser() != null) {
+            bob.append(USER).append(":").append(getUser()).append(";");
         }
         if (getPsk() != null) {
             bob.append(PSK).append(":").append(escape(getPsk())).append(";");
diff --git a/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java b/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java
new file mode 100644
index 0000000..851eabb
--- /dev/null
+++ b/core/src/test/java/net/glxn/qrgen/core/scheme/EnterpriseWifiTest.java
@@ -0,0 +1,90 @@
+package net.glxn.qrgen.core.scheme;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import net.glxn.qrgen.core.scheme.Wifi.Authentication;
+
+import org.junit.Test;
+
+public class EnterpriseWifiTest {
+
+    @Test
+    public void parse() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse(
+                "WIFI:S:some weird SSID;U:Spock;P:aintNoSecret;E:PEAP;PH:MS-CHAPv2;H:true;");
+        assertEquals("some weird SSID", wifi.getSsid());
+        assertEquals("Spock", wifi.getUser());
+        assertEquals("aintNoSecret", wifi.getPsk());
+        assertEquals("PEAP", wifi.getEap());
+        assertEquals("MS-CHAPv2", wifi.getPhase());
+        assertEquals(true, wifi.isHidden());
+    }
+
+    /**
+     * The following characters need to be escaped with a backslash (\) in the
+     * SSID and PSK strings: backslash (\), single-quote ('), double-quote ("),
+     * dot (.), colon (:), comma (,), and semicolon (;)
+     */
+    @Test
+    public void parseEscapeSsidAndAuth() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse(
+                "WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;U:Sp\\;ock;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;E:PEAP;PH:MS-CHAPv2;false;");
+
+        assertEquals("s;o,\"me 'wei\\rd. SSID;", wifi.getSsid());
+        assertEquals("Sp;ock", wifi.getUser());
+        assertEquals(";a,\"intNo,Sec\\ret", wifi.getPsk());
+        assertEquals("PEAP", wifi.getEap());
+        assertEquals("MS-CHAPv2", wifi.getPhase());
+        assertEquals(false, wifi.isHidden());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void parseNull() {
+        EnterpriseWifi.parse(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void parseEmptyString() {
+        EnterpriseWifi.parse("");
+    }
+
+    @Test
+    public void parseHeaderOnly() {
+        EnterpriseWifi wifi = EnterpriseWifi.parse("WIFI:");
+        assertNull(null, wifi.getSsid());
+        assertNull(null, wifi.getUser());
+        assertNull(null, wifi.getPsk());
+        assertNull(null, wifi.getEap());
+        assertNull(null, wifi.getPhase());
+        assertEquals(false, wifi.isHidden());
+    }
+
+    @Test
+    public void testToString() {
+        EnterpriseWifi wifi = new EnterpriseWifi();
+        wifi.setSsid("some weird SSID");
+        wifi.setUser("Spock");
+        wifi.setPsk("aintNoSecret");
+        wifi.setEap("PEAP");
+        wifi.setPhase("MS-CHAPv2");
+        wifi.setHidden(true);
+
+        assertEquals("WIFI:S:some weird SSID;U:Spcok;P:aintNoSecret;E:PEAP;PH:MS-CHAPv2;H:true;",
+                wifi.toString());
+    }
+
+    @Test
+    public void testToStringEscapeUsernameAndPassword() {
+        EnterpriseWifi wifi = new EnterpriseWifi();
+        wifi.setSsid("s;o,\"me 'wei\\rd. SSID;");
+        wifi.setUser("Sp;ock");
+        wifi.setPsk(";a,\"intNo,Sec\\ret");
+        wifi.setEap("PEAP");
+        wifi.setPhase("MS-CHAPv2");
+        wifi.setHidden(false);
+
+        assertEquals("WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;U:Sp\\;ock;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;E:PEAP;PH:MS-CHAPv2;H:false;",
+                wifi.toString());
+    }
+
+}
diff --git a/core/src/test/java/net/glxn/qrgen/core/scheme/WifiTest.java b/core/src/test/java/net/glxn/qrgen/core/scheme/WifiTest.java
index 3eabe49..bbdace9 100644
--- a/core/src/test/java/net/glxn/qrgen/core/scheme/WifiTest.java
+++ b/core/src/test/java/net/glxn/qrgen/core/scheme/WifiTest.java
@@ -11,10 +11,12 @@ public class WifiTest {
 	@Test
 	public void parse() {
 		Wifi wifi = Wifi.parse(
-				"WIFI:S:some weird SSID;T:WPA;P:aintNoSecret;H:true;");
+				"WIFI:S:some weird SSID;T:WPA;P:aintNoSecret;E:PEAP;PH:MS-CHAPv2;H:true;");
 		assertEquals("some weird SSID", wifi.getSsid());
 		assertEquals("WPA", wifi.getAuthentication());
 		assertEquals("aintNoSecret", wifi.getPsk());
+		assertEquals("PEAP", wifi.getEap());
+		assertEquals("MS-CHAPv2", wifi.getPhase());
 		assertEquals(true, wifi.isHidden());
 	}
 
@@ -26,11 +28,13 @@ public void parse() {
 	@Test
 	public void parseEscapeSsidAndPassword() {
 		Wifi wifi = Wifi.parse(
-				"WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;T:WPA;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;false;");
+				"WIFI:S:s\\;o\\,\\\"me \\'wei\\\\rd\\. SSID\\;;T:WPA;P:\\;a\\,\\\"intNo\\,Sec\\\\ret;false;E:PEAP;PH:MS-CHAPv2;");
 		
 		assertEquals("s;o,\"me 'wei\\rd. SSID;", wifi.getSsid());
 		assertEquals("WPA", wifi.getAuthentication());
 		assertEquals(";a,\"intNo,Sec\\ret", wifi.getPsk());
+		assertEquals("PEAP", wifi.getEap());
+		assertEquals("MS-CHAPv2", wifi.getPhase());
 		assertEquals(false, wifi.isHidden());
 	}
 
@@ -50,6 +54,8 @@ public void parseHeaderOnly() {
 		assertNull(null, wifi.getSsid());
 		assertNull(null, wifi.getAuthentication());
 		assertNull(null, wifi.getPsk());
+		assertNull(null, wifi.getEap());
+		assertNull(null, wifi.getPhase());
 		assertEquals(false, wifi.isHidden());
 	}
 
@@ -59,6 +65,8 @@ public void testToString() {
 		wifi.setSsid("some weird SSID");
 		wifi.setAuthentication(Authentication.WPA);
 		wifi.setPsk("aintNoSecret");
+		wifi.setEap("PEAP");
+		wifi.setPhase("MS-CHAPv2");
 		wifi.setHidden(true);
 
 		assertEquals("WIFI:S:some weird SSID;T:WPA;P:aintNoSecret;H:true;",

From b9d83bed15a7b19e6994267f60cafa31a131c4df Mon Sep 17 00:00:00 2001
From: Nick <handnf@gmail.com>
Date: Sun, 30 Oct 2016 16:26:50 -0400
Subject: [PATCH 4/4] Made some variables private

---
 .../glxn/qrgen/core/scheme/EnterpriseWifi.java |  9 ++++-----
 .../java/net/glxn/qrgen/core/scheme/Wifi.java  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
index c192d5e..6eb4f92 100644
--- a/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/EnterpriseWifi.java
@@ -5,17 +5,16 @@
 import static net.glxn.qrgen.core.scheme.SchemeUtil.getParameters;
 
 /**
- * Encodes a Wifi connection, format is:
+ * Encodes a Wifi connection containing a username / password scheme for authentication, format is:
  * <code>WIFI:S:SSID;U:USER;P:PSK;E:EAP;PH:PHASE;;</code>
  */
 public class EnterpriseWifi extends Wifi {
-    private static final String USER = "U";
-    private static final String EAP = "E";
-    private static final String PHASE = "PH";
+    public static final String USER = "U";
+    public static final String EAP = "E";
+    public static final String PHASE = "PH";
     private String user;
     private String eap;
     private String phase;
-    private boolean hidden = false;
 
     public EnterpriseWifi() {
     }
diff --git a/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java b/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
index d4f1863..d29d13d 100644
--- a/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
+++ b/core/src/main/java/net/glxn/qrgen/core/scheme/Wifi.java
@@ -9,16 +9,16 @@
  * <code>WIFI:T:AUTHENTICATION;S:SSID;P:PSK;H:HIDDEN;</code>
  */
 public class Wifi {
+	public static final String WIFI_PROTOCOL_HEADER = "WIFI:";
+	public static final String AUTHENTICATION = "T";
+	public static final String SSID = "S";
+	public static final String PSK = "P";
+	public static final String HIDDEN = "H";
+	private String authentication;
+	private String ssid;
+	private String psk;
+	private boolean hidden = false;
 
-	protected static final String WIFI_PROTOCOL_HEADER = "WIFI:";
-	protected static final String AUTHENTICATION = "T";
-	protected static final String SSID = "S";
-	protected static final String PSK = "P";
-	protected static final String HIDDEN = "H";
-	protected String authentication;
-	protected String ssid;
-	protected String psk;
-	protected boolean hidden = false;
 	public Wifi() {
 	}