Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix new chat conversation

Browse source
This commit is contained in:
Margaux Clerc 2016-02-15 11:00:04 +01:00
parent a9905228ad
commit 56a82f7165
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/layout/chat.xml
View file

@ -141,7 +141,6 @@
android:visibility="gone" android:visibility="gone"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"
android:gravity="center"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_below="@id/top_bar" android:layout_below="@id/top_bar"
android:inputType="textPersonName"/> android:inputType="textPersonName"/>

6
src/org/linphone/ChatFragment.java
View file

@ -721,7 +721,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
//Start new conversation in fast chat //Start new conversation in fast chat
if(newChatConversation && chatRoom == null) { if(newChatConversation && chatRoom == null) {
String address = searchContactField.getText().toString(); String address = searchContactField.getText().toString().toLowerCase();
if (address != null && !address.equals("")) { if (address != null && !address.equals("")) {
initChatRoom(address); initChatRoom(address);
} }
@ -974,11 +974,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
edit.setVisibility(View.INVISIBLE); edit.setVisibility(View.INVISIBLE);
startCall.setVisibility(View.INVISIBLE); startCall.setVisibility(View.INVISIBLE);
contactName.setVisibility(View.INVISIBLE); contactName.setVisibility(View.INVISIBLE);
resultContactsSearch.setVisibility(View.VISIBLE); resultContactsSearch.setVisibility(View.VISIBLE);
searchAdapter = new SearchContactsListAdapter(null); searchAdapter = new SearchContactsListAdapter(null);
resultContactsSearch.setAdapter(searchAdapter); resultContactsSearch.setAdapter(searchAdapter);
searchContactField.setVisibility(View.VISIBLE); searchContactField.setVisibility(View.VISIBLE);
searchContactField.requestFocus();
searchContactField.addTextChangedListener(new TextWatcher() { searchContactField.addTextChangedListener(new TextWatcher() {
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) {} public void onTextChanged(CharSequence s, int start, int before, int count) {}
@ -1015,7 +1015,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
for (ContactAddress c : searchAdapter.contacts) { for (ContactAddress c : searchAdapter.contacts) {
String address = c.address; String address = c.address;
if(address.startsWith("sip:")) address = address.substring(4); if(address.startsWith("sip:")) address = address.substring(4);
if (c.contact.getName().toLowerCase().startsWith(search) || address.toLowerCase().startsWith(search)) { if (c.contact.getName().toLowerCase().startsWith(search.toLowerCase()) || address.toLowerCase().startsWith(search.toLowerCase())) {
result.add(c); result.add(c);
} }
} }