WifiSettings überarbeitet, kleine fixes

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / wifi / WifiNetworkSettings.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java b/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java
index 3c1ba68509ac0d02e73314829168621042ece73e..4eb994743049f32684b16b36a438c7127604318e 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java
@@ -83,6 +83,7 @@ public class WifiNetworkSettings {
                 "uD3s1d70097Es++KwAg=\n" +
                 "-----END CERTIFICATE-----\n"));
 
+        /*
         presets.add((new WifiNetworkSettings("dhbw-802.1x", "dhbw-802.1x", WifiNetworkAuthenticationTypes.WIFI_AUTHTYPE_WPA_ENTERPRISE)).
                 setWpaEnterprise(
                         new int[]{WifiConfiguration.KeyMgmt.WPA_EAP, WifiConfiguration.KeyMgmt.IEEE8021X},
@@ -111,6 +112,7 @@ public class WifiNetworkSettings {
                 "xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU\n" +
                 "Cm26OWMohpLzGITY+9HPBVZkVw==\n" +
                 "-----END CERTIFICATE-----"));
+        */
 
         presets.add((new WifiNetworkSettings("eduroam", "eduroam", WifiNetworkAuthenticationTypes.WIFI_AUTHTYPE_WPA_ENTERPRISE)).
                 setWpaEnterprise(
@@ -171,12 +173,6 @@ public class WifiNetworkSettings {
 
     public TabLayout.Tab tab;
     public boolean isInScanResult = false;
-    public boolean isTryConnecting = false;
-    public boolean isAssociating = false;
-    public boolean isAssociated = false;
-    public boolean isAuthenticated = false;
-    public boolean isDisconnected = false;
-    public boolean failedAuthentication = false;
 
     public WifiNetworkSettings(String name, String ssid, WifiNetworkAuthenticationTypes authType) {
         this.name = name;
@@ -261,4 +257,8 @@ public class WifiNetworkSettings {
         return caName;
     }
 
+    public SecureLoginManager getSecureLoginManager() {
+        return performDHSecureLogin;
+    }
+
 }