From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 16 Jun 2015 14:42:40 +0000 (+0200)
Subject: android: Extend GUI so the server port can be entered
X-Git-Tag: 5.3.3dr3~8^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c0ec35c538561c0bdbcf765d94e33d5390dbbe3;p=thirdparty%2Fstrongswan.git

android: Extend GUI so the server port can be entered
---

diff --git a/src/frontends/android/res/layout/profile_detail_view.xml b/src/frontends/android/res/layout/profile_detail_view.xml
index 15fe42401b..089f0655bc 100644
--- a/src/frontends/android/res/layout/profile_detail_view.xml
+++ b/src/frontends/android/res/layout/profile_detail_view.xml
@@ -165,6 +165,20 @@
                 android:inputType="number|textNoSuggestions"
                 android:hint="@string/profile_use_default_hint" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/profile_port_label" />
+
+            <EditText
+                android:id="@+id/port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="number|textNoSuggestions"
+                android:hint="@string/profile_use_default_hint" />
+
         </LinearLayout>
     </LinearLayout>
 
diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/res/values-de/strings.xml
index 4dfffb7098..6cdb5b37d1 100644
--- a/src/frontends/android/res/values-de/strings.xml
+++ b/src/frontends/android/res/values-de/strings.xml
@@ -65,6 +65,7 @@
     <string name="profile_ca_select_certificate">Wählen Sie ein bestimmtes CA-Zertifikat</string>
     <string name="profile_show_advanced_label">Erweiterte Einstellungen anzeigen</string>
     <string name="profile_mtu_label">MTU:</string>
+    <string name="profile_port_label">Server Port:</string>
     <string name="profile_use_default_hint">(Standardwert verwenden)</string>
     <!-- Warnings/Notifications in the details view -->
     <string name="alert_text_no_input_gateway">Bitte geben Sie hier die Gateway-Adresse ein</string>
diff --git a/src/frontends/android/res/values-pl/strings.xml b/src/frontends/android/res/values-pl/strings.xml
index a46e8da2aa..87c6a2726a 100644
--- a/src/frontends/android/res/values-pl/strings.xml
+++ b/src/frontends/android/res/values-pl/strings.xml
@@ -65,6 +65,7 @@
     <string name="profile_ca_select_certificate">Wybierz określony certyfikat CA</string>
     <string name="profile_show_advanced_label">Show advanced settings</string>
     <string name="profile_mtu_label">MTU:</string>
+    <string name="profile_port_label">Server port:</string>
     <string name="profile_use_default_hint">(use default)</string>
     <!-- Warnings/Notifications in the details view -->
     <string name="alert_text_no_input_gateway">Wprowadź adres bramki</string>
diff --git a/src/frontends/android/res/values-ru/strings.xml b/src/frontends/android/res/values-ru/strings.xml
index 7fbe231d32..4164f61ca5 100644
--- a/src/frontends/android/res/values-ru/strings.xml
+++ b/src/frontends/android/res/values-ru/strings.xml
@@ -62,6 +62,7 @@
     <string name="profile_ca_select_certificate">Выбрать CA сертификат</string>
     <string name="profile_show_advanced_label">Show advanced settings</string>
     <string name="profile_mtu_label">MTU:</string>
+    <string name="profile_port_label">Server port:</string>
     <string name="profile_use_default_hint">(use default)</string>
     <!-- Warnings/Notifications in the details view -->
     <string name="alert_text_no_input_gateway">Пожалуйста введите адрес шлюза</string>
diff --git a/src/frontends/android/res/values-ua/strings.xml b/src/frontends/android/res/values-ua/strings.xml
index 19587b2194..7e3a73531f 100644
--- a/src/frontends/android/res/values-ua/strings.xml
+++ b/src/frontends/android/res/values-ua/strings.xml
@@ -63,6 +63,7 @@
     <string name="profile_ca_select_certificate">Вибрати спеціальний сертифікат CA</string>
     <string name="profile_show_advanced_label">Show advanced settings</string>
     <string name="profile_mtu_label">MTU:</string>
+    <string name="profile_port_label">Server port:</string>
     <string name="profile_use_default_hint">(use default)</string>
     <!-- Warnings/Notifications in the details view -->
     <string name="alert_text_no_input_gateway">Введіть адресу шлюза тут</string>
diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml
index 3e9d7337c6..3c067611d8 100644
--- a/src/frontends/android/res/values/strings.xml
+++ b/src/frontends/android/res/values/strings.xml
@@ -65,6 +65,7 @@
     <string name="profile_ca_select_certificate">Select a specific CA certificate</string>
     <string name="profile_show_advanced_label">Show advanced settings</string>
     <string name="profile_mtu_label">MTU:</string>
+    <string name="profile_port_label">Server port:</string>
     <string name="profile_use_default_hint">(use default)</string>
     <!-- Warnings/Notifications in the details view -->
     <string name="alert_text_no_input_gateway">Please enter the gateway address here</string>
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
index 8d8e07f9da..ff1625c625 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -84,6 +84,7 @@ public class VpnProfileDetailActivity extends Activity
 	private CheckBox mShowAdvanced;
 	private ViewGroup mAdvancedSettings;
 	private EditText mMTU;
+	private EditText mPort;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState)
@@ -117,6 +118,7 @@ public class VpnProfileDetailActivity extends Activity
 		mAdvancedSettings = (ViewGroup)findViewById(R.id.advanced_settings);
 
 		mMTU = (EditText)findViewById(R.id.mtu);
+		mPort = (EditText)findViewById(R.id.port);
 
 		mSelectVpnType.setOnItemSelectedListener(new OnItemSelectedListener() {
 			@Override
@@ -342,7 +344,7 @@ public class VpnProfileDetailActivity extends Activity
 		boolean show = mShowAdvanced.isChecked();
 		if (!show && mProfile != null)
 		{
-			show = mProfile.getMTU() != null;
+			show = mProfile.getMTU() != null || mProfile.getPort() != null;
 		}
 		mShowAdvanced.setVisibility(!show ? View.VISIBLE : View.GONE);
 		mAdvancedSettings.setVisibility(show ? View.VISIBLE : View.GONE);
@@ -408,6 +410,12 @@ public class VpnProfileDetailActivity extends Activity
 			mMTU.setError(String.format(getString(R.string.alert_text_out_of_range), MTU_MIN, MTU_MAX));
 			valid = false;
 		}
+		Integer port = getInteger(mPort);
+		if (port != null && (port < 1 || port > 65535))
+		{
+			mPort.setError(String.format(getString(R.string.alert_text_out_of_range), 1, 65535));
+			valid = false;
+		}
 		return valid;
 	}
 
@@ -436,6 +444,7 @@ public class VpnProfileDetailActivity extends Activity
 		String certAlias = mCheckAuto.isChecked() ? null : mCertEntry.getAlias();
 		mProfile.setCertificateAlias(certAlias);
 		mProfile.setMTU(getInteger(mMTU));
+		mProfile.setPort(getInteger(mPort));
 	}
 
 	/**
@@ -459,6 +468,7 @@ public class VpnProfileDetailActivity extends Activity
 				mUsername.setText(mProfile.getUsername());
 				mPassword.setText(mProfile.getPassword());
 				mMTU.setText(mProfile.getMTU() != null ? mProfile.getMTU().toString() : null);
+				mPort.setText(mProfile.getPort() != null ? mProfile.getPort().toString() : null);
 				useralias = mProfile.getUserCertificateAlias();
 				alias = mProfile.getCertificateAlias();
 				getActionBar().setTitle(mProfile.getName());