diff --git a/res/layout/chat.xml b/res/layout/chat.xml index 9f4480845..6c3f47cfb 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -74,7 +74,7 @@ android:layout_centerHorizontal="true" android:background="@color/colorD"> - @@ -103,20 +103,21 @@ + android:layout_toRightOf="@id/send_picture" + android:layout_toLeftOf="@id/send_message" + android:background="@drawable/resizable_textfield" + android:layout_centerVertical="true" + /> - + 0) { diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java index 8e25244ab..b2388c0d6 100644 --- a/src/org/linphone/LinphoneContact.java +++ b/src/org/linphone/LinphoneContact.java @@ -429,8 +429,6 @@ public class LinphoneContact implements Serializable, Comparable>> LinphoneContact - isLinphoneFriend :" + getFriendPresenceModel().toString()); } } diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index de57faa1b..71bb7cde6 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -367,6 +367,19 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag } } + //TODO to Complete + public void subscribeFriendList(boolean enabled){ + LinphoneCore lc = getLcIfManagerNotDestroyedOrNull(); + if(lc != null ) { + /* if (enabled) { + lc.linphone_friend_list_update_subscriptions(linphone_core_get_default_friend_list(LC), NULL, TRUE); + } else { + linphone_friend_list_close_subscriptions(linphone_core_get_default_friend_list(LC)); + } + */ + } + } + public void changeStatusToOnline() { LinphoneCore lc = getLcIfManagerNotDestroyedOrNull(); @@ -866,7 +879,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { for(AvatarWithPresenceImage listener : listeners){ if(listener.isThisFriend(lf)){ - //Log.e("===>> LinphoneManager : notifyPresenceReceived : "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType()); + Log.e("===>> LinphoneManager : notifyPresenceReceived : "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType()); listener.updatePresenceIcon(lc, lf); } }