diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java index fe523e158..6710342f0 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java @@ -90,6 +90,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity private RelativeLayout mTncNotice; private CheckBox mShowAdvanced; private ViewGroup mAdvancedSettings; + private EditText mRemoteId; + private TextInputLayoutHelper mRemoteIdWrap; private EditText mMTU; private TextInputLayoutHelper mMTUWrap; private EditText mPort; @@ -131,6 +133,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity mShowAdvanced = (CheckBox)findViewById(R.id.show_advanced); mAdvancedSettings = (ViewGroup)findViewById(R.id.advanced_settings); + mRemoteId = (EditText)findViewById(R.id.remote_id); + mRemoteIdWrap = (TextInputLayoutHelper) findViewById(R.id.remote_id_wrap); mMTU = (EditText)findViewById(R.id.mtu); mMTUWrap = (TextInputLayoutHelper) findViewById(R.id.mtu_wrap); mPort = (EditText)findViewById(R.id.port); @@ -151,10 +155,12 @@ public class VpnProfileDetailActivity extends AppCompatActivity if (TextUtils.isEmpty(mGateway.getText())) { mNameWrap.setHelperText(getString(R.string.profile_name_hint)); + mRemoteIdWrap.setHelperText(getString(R.string.profile_remote_id_hint)); } else { mNameWrap.setHelperText(String.format(getString(R.string.profile_name_hint_gateway), mGateway.getText())); + mRemoteIdWrap.setHelperText(String.format(getString(R.string.profile_remote_id_hint_gateway), mGateway.getText())); } } }); @@ -384,7 +390,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity if (!show && mProfile != null) { Integer st = mProfile.getSplitTunneling(); - show = mProfile.getMTU() != null || mProfile.getPort() != null || (st != null && st != 0); + show = mProfile.getRemoteId() != null || mProfile.getMTU() != null || + mProfile.getPort() != null || (st != null && st != 0); } mShowAdvanced.setVisibility(!show ? View.VISIBLE : View.GONE); mAdvancedSettings.setVisibility(show ? View.VISIBLE : View.GONE); @@ -483,6 +490,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity } String certAlias = mCheckAuto.isChecked() ? null : mCertEntry.getAlias(); mProfile.setCertificateAlias(certAlias); + String remote_id = mRemoteId.getText().toString().trim(); + mProfile.setRemoteId(remote_id.isEmpty() ? null : remote_id); mProfile.setMTU(getInteger(mMTU)); mProfile.setPort(getInteger(mPort)); int st = 0; @@ -511,6 +520,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity mVpnType = mProfile.getVpnType(); mUsername.setText(mProfile.getUsername()); mPassword.setText(mProfile.getPassword()); + mRemoteId.setText(mProfile.getRemoteId()); mMTU.setText(mProfile.getMTU() != null ? mProfile.getMTU().toString() : null); mPort.setText(mProfile.getPort() != null ? mProfile.getPort().toString() : null); mBlockIPv4.setChecked(mProfile.getSplitTunneling() != null ? (mProfile.getSplitTunneling() & VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4) != 0 : false); diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml index 4a1cc6175..737c2f9a3 100644 --- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml +++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml @@ -180,10 +180,26 @@ android:text="@string/profile_advanced_label" /> + + + + + + Wählen Sie ein bestimmtes CA-Zertifikat Erweiterte Einstellungen Erweiterte Einstellungen anzeigen + Server-Identität + Standardwert ist der konfigurierte Server. Eigene Werte werden explizit and den Server gesendet und während der Authentifizierung erzwungen + Standardwert ist \"%1$s\". Eigene Werte werden explizit and den Server gesendet und während der Authentifizierung erzwungen MTU des VPN Tunnel-Device Falls der Standardwert in einem bestimmten Netzwerk nicht geeignet ist Server Port diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml index c8c159537..cfd877f50 100644 --- a/src/frontends/android/app/src/main/res/values-pl/strings.xml +++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml @@ -67,6 +67,9 @@ Wybierz określony certyfikat CA Advanced settings Show advanced settings + Server identity + Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication + Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml index 0550fb292..cfd8129bd 100644 --- a/src/frontends/android/app/src/main/res/values-ru/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml @@ -64,6 +64,9 @@ Выбрать CA сертификат Advanced settings Show advanced settings + Server identity + Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication + Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml index a52074876..85969898f 100644 --- a/src/frontends/android/app/src/main/res/values-ua/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml @@ -65,6 +65,9 @@ Вибрати спеціальний сертифікат CA Advanced settings Show advanced settings + Server identity + Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication + Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml index 76886cd6d..d704da062 100644 --- a/src/frontends/android/app/src/main/res/values/strings.xml +++ b/src/frontends/android/app/src/main/res/values/strings.xml @@ -67,6 +67,9 @@ Select a specific CA certificate Advanced settings Show advanced settings + Server identity + Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication + Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port