Change port to 636 if SSL is selected -

#5
weisserd · Jul 25, 2011 · 94ca894 · 94ca894
1 parent 5569052
commit 94ca894
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,7 @@
 * Added correct licensing terms (Apache License 2.0)
 * Removed the trace handler
 * Upgraded LDAP library to version 2.2.0 (smaller memory footprint - by 500kB)
+* If SSL is selected change port to 636 - https://github.com/weisserd/LDAP-Sync/issues/5
 
 1.4.2
 * Bugfixes (Possible Memory Leaks, AutoCompletion of BaseDNs, Photo handling) 

diff --git a/res/layout/login_activity.xml b/res/layout/login_activity.xml
@@ -37,6 +37,12 @@
 							android:capitalize="none" android:autoText="false"
 							android:minWidth="300dip" android:id="@+id/host_edit"
 							android:inputType="textUri" />
+						<TextView android:textAppearance="?android:attr/textAppearanceSmall"
+							android:textStyle="bold" android:layout_width="wrap_content"
+							android:layout_height="wrap_content" android:text="@string/login_activity_encryption_label" />
+						<Spinner android:id="@+id/encryption_spinner" android:layout_width="fill_parent"
+							android:layout_height="wrap_content" android:drawSelectorOnTop="true"
+							android:prompt="@string/login_activity_encryption_prompt" />
 						<TextView android:textAppearance="?android:attr/textAppearanceSmall"
 							android:textStyle="bold" android:layout_width="wrap_content"
 							android:layout_height="wrap_content" android:text="@string/login_activity_port_label" />
@@ -45,12 +51,6 @@
 							android:capitalize="none" android:autoText="false"
 							android:minWidth="300dip" android:id="@+id/port_edit"
 							android:inputType="number" />
-						<TextView android:textAppearance="?android:attr/textAppearanceSmall"
-							android:textStyle="bold" android:layout_width="wrap_content"
-							android:layout_height="wrap_content" android:text="@string/login_activity_encryption_label" />
-						<Spinner android:id="@+id/encryption_spinner" android:layout_width="fill_parent"
-							android:layout_height="wrap_content" android:drawSelectorOnTop="true"
-							android:prompt="@string/login_activity_encryption_prompt" />
 						<TextView android:textAppearance="?android:attr/textAppearanceSmall"
 							android:textStyle="bold" android:layout_width="wrap_content"
 							android:layout_height="wrap_content" android:text="@string/login_activity_username_label" />

diff --git a/src/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java b/src/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
@@ -128,7 +128,6 @@ public class LDAPAuthenticatorActivity extends AccountAuthenticatorActivity {
 	@Override
 	public void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
-
 		mAccountManager = AccountManager.get(this);
 
 		getDataFromIntent();
@@ -145,6 +144,9 @@ public void onCreate(Bundle bundle) {
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 				mEncryption = position;
+				if (position == 1) {
+					mPortEdit.setText("636");
+				}
 			}
 
 			@Override