android: Show an error if a profile without a password is initiated
This could happen if an incomplete profile is used with Always-on VPN.
This commit is contained in:
+8
@@ -274,6 +274,14 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
|
|||||||
if (initializeCharon(builder, mLogFile, mAppDir, mCurrentProfile.getVpnType().has(VpnTypeFeature.BYOD)))
|
if (initializeCharon(builder, mLogFile, mAppDir, mCurrentProfile.getVpnType().has(VpnTypeFeature.BYOD)))
|
||||||
{
|
{
|
||||||
Log.i(TAG, "charon started");
|
Log.i(TAG, "charon started");
|
||||||
|
|
||||||
|
if (mCurrentProfile.getVpnType().has(VpnTypeFeature.USER_PASS) &&
|
||||||
|
mCurrentProfile.getPassword() == null)
|
||||||
|
{ /* this can happen if Always-on VPN is enabled with an incomplete profile */
|
||||||
|
setError(ErrorState.PASSWORD_MISSING);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
SettingsWriter writer = new SettingsWriter();
|
SettingsWriter writer = new SettingsWriter();
|
||||||
writer.setValue("global.language", Locale.getDefault().getLanguage());
|
writer.setValue("global.language", Locale.getDefault().getLanguage());
|
||||||
writer.setValue("global.mtu", mCurrentProfile.getMTU());
|
writer.setValue("global.mtu", mCurrentProfile.getMTU());
|
||||||
|
|||||||
+3
@@ -61,6 +61,7 @@ public class VpnStateService extends Service
|
|||||||
LOOKUP_FAILED,
|
LOOKUP_FAILED,
|
||||||
UNREACHABLE,
|
UNREACHABLE,
|
||||||
GENERIC_ERROR,
|
GENERIC_ERROR,
|
||||||
|
PASSWORD_MISSING,
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -191,6 +192,8 @@ public class VpnStateService extends Service
|
|||||||
return R.string.error_lookup_failed;
|
return R.string.error_lookup_failed;
|
||||||
case UNREACHABLE:
|
case UNREACHABLE:
|
||||||
return R.string.error_unreachable;
|
return R.string.error_unreachable;
|
||||||
|
case PASSWORD_MISSING:
|
||||||
|
return R.string.error_password_missing;
|
||||||
default:
|
default:
|
||||||
return R.string.error_generic;
|
return R.string.error_generic;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,6 +187,7 @@
|
|||||||
<string name="error_auth_failed">Benutzerauthentifizierung ist fehlgeschlagen</string>
|
<string name="error_auth_failed">Benutzerauthentifizierung ist fehlgeschlagen</string>
|
||||||
<string name="error_assessment_failed">Sicherheitsassessment ist fehlgeschlagen</string>
|
<string name="error_assessment_failed">Sicherheitsassessment ist fehlgeschlagen</string>
|
||||||
<string name="error_generic">Unbekannter Fehler während des Verbindens</string>
|
<string name="error_generic">Unbekannter Fehler während des Verbindens</string>
|
||||||
|
<string name="error_password_missing">Passwort nicht verfügbar</string>
|
||||||
<string name="vpn_connected">VPN verbunden</string>
|
<string name="vpn_connected">VPN verbunden</string>
|
||||||
<string name="vpn_profile_connected">Dieses VPN Profil ist momentan verbunden!</string>
|
<string name="vpn_profile_connected">Dieses VPN Profil ist momentan verbunden!</string>
|
||||||
<string name="reconnect">Neu verbinden</string>
|
<string name="reconnect">Neu verbinden</string>
|
||||||
|
|||||||
@@ -187,6 +187,7 @@
|
|||||||
<string name="error_auth_failed">Błąd przy autoryzacji użytkownika</string>
|
<string name="error_auth_failed">Błąd przy autoryzacji użytkownika</string>
|
||||||
<string name="error_assessment_failed">Security assessment failed</string>
|
<string name="error_assessment_failed">Security assessment failed</string>
|
||||||
<string name="error_generic">Nieznany błąd w czasie połączenia</string>
|
<string name="error_generic">Nieznany błąd w czasie połączenia</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">Połączenie z VPN</string>
|
<string name="vpn_connected">Połączenie z VPN</string>
|
||||||
<string name="vpn_profile_connected">Ten profil VPN jest obecnie połaczony!</string>
|
<string name="vpn_profile_connected">Ten profil VPN jest obecnie połaczony!</string>
|
||||||
<string name="reconnect">Połączyć ponownie</string>
|
<string name="reconnect">Połączyć ponownie</string>
|
||||||
|
|||||||
@@ -184,6 +184,7 @@
|
|||||||
<string name="error_auth_failed">Ошибка авторизации пользователя</string>
|
<string name="error_auth_failed">Ошибка авторизации пользователя</string>
|
||||||
<string name="error_assessment_failed">Security assessment failed</string>
|
<string name="error_assessment_failed">Security assessment failed</string>
|
||||||
<string name="error_generic">Неизвестная ошибка</string>
|
<string name="error_generic">Неизвестная ошибка</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">Соединение с VPN установлено</string>
|
<string name="vpn_connected">Соединение с VPN установлено</string>
|
||||||
<string name="vpn_profile_connected">Подключение к этому профилю VPN уже существует!</string>
|
<string name="vpn_profile_connected">Подключение к этому профилю VPN уже существует!</string>
|
||||||
<string name="reconnect">Переподключить</string>
|
<string name="reconnect">Переподключить</string>
|
||||||
|
|||||||
@@ -185,6 +185,7 @@
|
|||||||
<string name="error_auth_failed">Помилка аутентифікації користувача</string>
|
<string name="error_auth_failed">Помилка аутентифікації користувача</string>
|
||||||
<string name="error_assessment_failed">Security assessment failed</string>
|
<string name="error_assessment_failed">Security assessment failed</string>
|
||||||
<string name="error_generic">Невідома помилка під час підключення</string>
|
<string name="error_generic">Невідома помилка під час підключення</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">VPN підключено</string>
|
<string name="vpn_connected">VPN підключено</string>
|
||||||
<string name="vpn_profile_connected">Цей VPN профіль зараз підключений!</string>
|
<string name="vpn_profile_connected">Цей VPN профіль зараз підключений!</string>
|
||||||
<string name="reconnect">Перепідключитися</string>
|
<string name="reconnect">Перепідключитися</string>
|
||||||
|
|||||||
@@ -184,6 +184,7 @@
|
|||||||
<string name="error_auth_failed">用户鉴权失败</string>
|
<string name="error_auth_failed">用户鉴权失败</string>
|
||||||
<string name="error_assessment_failed">可靠性评估失败</string>
|
<string name="error_assessment_failed">可靠性评估失败</string>
|
||||||
<string name="error_generic">连接中遭遇未知失败</string>
|
<string name="error_generic">连接中遭遇未知失败</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">VPN已连接</string>
|
<string name="vpn_connected">VPN已连接</string>
|
||||||
<string name="vpn_profile_connected">此VPN配置目前已连接。</string>
|
<string name="vpn_profile_connected">此VPN配置目前已连接。</string>
|
||||||
<string name="reconnect">重连</string>
|
<string name="reconnect">重连</string>
|
||||||
|
|||||||
@@ -184,6 +184,7 @@
|
|||||||
<string name="error_auth_failed">用戶授權失敗</string>
|
<string name="error_auth_failed">用戶授權失敗</string>
|
||||||
<string name="error_assessment_failed">穩定性評估失敗</string>
|
<string name="error_assessment_failed">穩定性評估失敗</string>
|
||||||
<string name="error_generic">連線中遇到不明錯誤</string>
|
<string name="error_generic">連線中遇到不明錯誤</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">VPN已連線</string>
|
<string name="vpn_connected">VPN已連線</string>
|
||||||
<string name="vpn_profile_connected">這個VPN設定檔目前已經連線。</string>
|
<string name="vpn_profile_connected">這個VPN設定檔目前已經連線。</string>
|
||||||
<string name="reconnect">重新連線</string>
|
<string name="reconnect">重新連線</string>
|
||||||
|
|||||||
@@ -187,6 +187,7 @@
|
|||||||
<string name="error_auth_failed">User authentication failed</string>
|
<string name="error_auth_failed">User authentication failed</string>
|
||||||
<string name="error_assessment_failed">Security assessment failed</string>
|
<string name="error_assessment_failed">Security assessment failed</string>
|
||||||
<string name="error_generic">Unspecified failure while connecting</string>
|
<string name="error_generic">Unspecified failure while connecting</string>
|
||||||
|
<string name="error_password_missing">Password unavailable</string>
|
||||||
<string name="vpn_connected">VPN connected</string>
|
<string name="vpn_connected">VPN connected</string>
|
||||||
<string name="vpn_profile_connected">This VPN profile is currently connected!</string>
|
<string name="vpn_profile_connected">This VPN profile is currently connected!</string>
|
||||||
<string name="reconnect">Reconnect</string>
|
<string name="reconnect">Reconnect</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user