sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

android: Make VpnType#fromIdentifier null-safe

Browse Source
This commit is contained in:
Markus Pfeiffer 2023-11-21 15:37:24 +01:00 committed by Tobias Brunner
parent a5167a69e0
commit 01ea7b92bd
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnType.java
View File

@ -17,6 +17,10 @@
package org.strongswan.android.data;
import java.util.EnumSet;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
public enum VpnType
{
@ -32,11 +36,19 @@ public enum VpnType
*/
public enum VpnTypeFeature
{
/** client certificate is required */
/**
* Client certificate is required
*/
CERTIFICATE,
/** username and password are required */
/**
* Username and password are required
*/
USER_PASS,
/** enable BYOD features */
/**
* Enable BYOD features
*/
BYOD;
}
@ -48,7 +60,6 @@ public enum VpnType
*
* @param id identifier used to store and transmit this specific type
* @param features of the given VPN type
* @param certificate true if a client certificate is required
*/
VpnType(String id, EnumSet<VpnTypeFeature> features)
{
@ -58,6 +69,7 @@ public enum VpnType
/**
* The identifier used to store this value in the database
*
* @return identifier
*/
public String getIdentifier()
@ -81,11 +93,12 @@ public enum VpnType
* @param identifier get the enum entry with this identifier
* @return the enum entry, or the default if not found
*/
public static VpnType fromIdentifier(String identifier)
@NonNull
public static VpnType fromIdentifier(@Nullable String identifier)
{
for (VpnType type : VpnType.values())
{
if (identifier.equals(type.mIdentifier))
if (Objects.equals(identifier, type.mIdentifier))
{
return type;
}