From 65740199bf0a5beed35f428eb6cbf88e92d15342 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 12 Oct 2017 12:01:34 +0200
Subject: [PATCH] Fixing login view for tablet 533dp

---
 res/layout-sw533dp-land/assistant_login.xml   | 23 +++++++++++++++++++
 res/layout/assistant_login.xml                |  2 --
 .../linphone/assistant/AssistantActivity.java |  7 +++---
 .../org/linphone/assistant/LoginFragment.java |  6 +++--
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/res/layout-sw533dp-land/assistant_login.xml b/res/layout-sw533dp-land/assistant_login.xml
index 1708857cf..255446aad 100644
--- a/res/layout-sw533dp-land/assistant_login.xml
+++ b/res/layout-sw533dp-land/assistant_login.xml
@@ -146,6 +146,29 @@
 				android:gravity="center"
 				android:layout_margin="10dp">
 
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+					<TextView
+						android:text="@string/userid"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/assistant_userid"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="text|textNoSuggestions"
+						android:contentDescription="@string/content_description_username_field"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:maxLines="1"/>
+
+				</LinearLayout>
 				<LinearLayout
 					android:orientation="vertical"
 					android:layout_width="0dp"
diff --git a/res/layout/assistant_login.xml b/res/layout/assistant_login.xml
index c35bc4207..d35976278 100644
--- a/res/layout/assistant_login.xml
+++ b/res/layout/assistant_login.xml
@@ -105,7 +105,6 @@
 				android:maxLines="1"/>
 
 			<TextView
-				android:visibility="gone"
 				android:text="@string/assistant_display_name_optional"
 				style="@style/font13"
 				android:textAllCaps="true"
@@ -114,7 +113,6 @@
 				android:layout_height="wrap_content"/>
 
 			<EditText
-				android:visibility="gone"
 				android:id="@+id/assistant_display_name"
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index d32ad79a2..a0a14851b 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -410,8 +410,8 @@ private static AssistantActivity instance;
 		configureLinphoneProxyConfig(accountCreator);
 	}
 
-	public void genericLogIn(String username, String userid, String password, String prefix, String domain, TransportType transport) {
-		saveCreatedAccount(username, userid, password, null, prefix, domain, transport);
+	public void genericLogIn(String username, String userid, String password, String displayname, String prefix, String domain, TransportType transport) {
+		saveCreatedAccount(username, userid, password, displayname, null, prefix, domain, transport);
 	}
 
 	private void display(AssistantFragmentsEnum fragment) {
@@ -507,7 +507,7 @@ private static AssistantActivity instance;
 		return phoneNumberWithCountry;
 	}
 
-	public void saveCreatedAccount(String username, String userid, String password, String ha1, String prefix, String domain, TransportType transport) {
+	public void saveCreatedAccount(String username, String userid, String password, String displayname, String ha1, String prefix, String domain, TransportType transport) {
 
 		username = LinphoneUtils.getDisplayableUsernameFromAddress(username);
 		domain = LinphoneUtils.getDisplayableUsernameFromAddress(domain);
@@ -524,6 +524,7 @@ private static AssistantActivity instance;
 				.setDomain(domain)
 				.setHa1(ha1)
 				.setUserId(userid)
+				.setDisplayName(displayname)
 				.setPassword(password);
 
 		if (prefix != null) {
diff --git a/src/android/org/linphone/assistant/LoginFragment.java b/src/android/org/linphone/assistant/LoginFragment.java
index 4842bbc39..e8e4417fb 100644
--- a/src/android/org/linphone/assistant/LoginFragment.java
+++ b/src/android/org/linphone/assistant/LoginFragment.java
@@ -34,7 +34,7 @@ import android.widget.RadioGroup;
 import android.widget.Toast;
 
 public class LoginFragment extends Fragment implements OnClickListener, TextWatcher {
-	private EditText login, userid, password, domain;
+	private EditText login, userid, password, domain, displayName;
 	private RadioGroup transports;
 	private Button apply;
 
@@ -45,6 +45,8 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc
 
 		login = (EditText) view.findViewById(R.id.assistant_username);
 		login.addTextChangedListener(this);
+		displayName = (EditText) view.findViewById(R.id.assistant_display_name);
+		displayName.addTextChangedListener(this);
 		userid = (EditText) view.findViewById(R.id.assistant_userid);
 		userid.addTextChangedListener(this);
 		password = (EditText) view.findViewById(R.id.assistant_password);
@@ -83,7 +85,7 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc
 			if (domain.getText().toString().compareTo(getString(R.string.default_domain)) == 0) {
 				AssistantActivity.instance().displayLoginLinphone(login.getText().toString(), password.getText().toString());
 			} else {
-				AssistantActivity.instance().genericLogIn(login.getText().toString(), userid.getText().toString(), password.getText().toString(), null, domain.getText().toString(), transport);
+				AssistantActivity.instance().genericLogIn(login.getText().toString(), userid.getText().toString(), password.getText().toString(), displayName.getText().toString(), null, domain.getText().toString(), transport);
 			}
 		}
 	}