WifiConfigManager.java (zxing-zxing-3.4.1) | : | WifiConfigManager.java (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
skipping to change at line 259 | skipping to change at line 259 | |||
} | } | |||
} | } | |||
return false; | return false; | |||
} | } | |||
private static int parseEap(String eapString) { | private static int parseEap(String eapString) { | |||
if (eapString == null) { | if (eapString == null) { | |||
return WifiEnterpriseConfig.Eap.NONE; | return WifiEnterpriseConfig.Eap.NONE; | |||
} | } | |||
switch (eapString) { | switch (eapString) { | |||
case "NONE": | case "NONE": | |||
return WifiEnterpriseConfig.Eap.NONE; | return WifiEnterpriseConfig.Eap.NONE; | |||
case "PEAP": | case "PEAP": | |||
return WifiEnterpriseConfig.Eap.PEAP; | return WifiEnterpriseConfig.Eap.PEAP; | |||
case "PWD": | case "PWD": | |||
return WifiEnterpriseConfig.Eap.PWD; | return WifiEnterpriseConfig.Eap.PWD; | |||
case "TLS": | case "TLS": | |||
return WifiEnterpriseConfig.Eap.TLS; | return WifiEnterpriseConfig.Eap.TLS; | |||
case "TTLS": | case "TTLS": | |||
return WifiEnterpriseConfig.Eap.TTLS; | return WifiEnterpriseConfig.Eap.TTLS; | |||
default: | default: | |||
throw new IllegalArgumentException("Unknown value for EAP method: " + eapS | throw new IllegalArgumentException("Unknown value for EAP method: " + ea | |||
tring); | pString); | |||
} | } | |||
} | } | |||
private static int parsePhase2(String phase2String) { | private static int parsePhase2(String phase2String) { | |||
if (phase2String == null) { | if (phase2String == null) { | |||
return WifiEnterpriseConfig.Phase2.NONE; | return WifiEnterpriseConfig.Phase2.NONE; | |||
} | } | |||
switch (phase2String) { | switch (phase2String) { | |||
case "GTC": | case "GTC": | |||
return WifiEnterpriseConfig.Phase2.GTC; | return WifiEnterpriseConfig.Phase2.GTC; | |||
case "MSCHAP": | case "MSCHAP": | |||
return WifiEnterpriseConfig.Phase2.MSCHAP; | return WifiEnterpriseConfig.Phase2.MSCHAP; | |||
case "MSCHAPV2": | case "MSCHAPV2": | |||
return WifiEnterpriseConfig.Phase2.MSCHAPV2; | return WifiEnterpriseConfig.Phase2.MSCHAPV2; | |||
case "NONE": | case "NONE": | |||
return WifiEnterpriseConfig.Phase2.NONE; | return WifiEnterpriseConfig.Phase2.NONE; | |||
case "PAP": | case "PAP": | |||
return WifiEnterpriseConfig.Phase2.PAP; | return WifiEnterpriseConfig.Phase2.PAP; | |||
default: | default: | |||
throw new IllegalArgumentException("Unknown value for phase 2 method: " + | throw new IllegalArgumentException("Unknown value for phase 2 method: " | |||
phase2String); | + phase2String); | |||
} | } | |||
phase2String); | ||||
} | } | |||
} | } | |||
End of changes. 3 change blocks. | ||||
26 lines changed or deleted | 27 lines changed or added |