mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 12:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Presence] chat message fixed - display is back

Browse source
This commit is contained in:
Brieuc Viel 2016-04-18 16:59:01 +02:00
parent 6b0e9c3592
commit fd86b9735c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -387,21 +387,21 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
registerForContextMenu(v);
RelativeLayout rlayout = new RelativeLayout(context);
/* CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete_message);
//CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete_message);
if(isEditMode) {
deleteChatBubble.setVisibility(View.VISIBLE);
//deleteChatBubble.setVisibility(View.VISIBLE);
if(message.isOutgoing()){
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
layoutParams.setMargins(100, 10, 10, 10);
v.setLayoutParams(layoutParams);
} else {
LinearLayout message_layout = (LinearLayout) v.findViewById(R.id.message_content);
LinearLayout message_layout = (LinearLayout) v.findViewById(R.id.message_layout);
message_layout.setGravity(Gravity.RIGHT);
}
deleteChatBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
/* deleteChatBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
messagesList.setItemChecked(position, b);
@ -423,12 +423,13 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
}
});
if(messagesList.isItemChecked(position)) {
deleteChatBubble.setChecked(true);
} else {
deleteChatBubble.setChecked(false);
}
*/
rlayout.addView(v);
} else {
if(message.isOutgoing()){
@ -444,7 +445,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
}
rlayout.addView(v);
}
*/
return rlayout;
}
}

1
src/org/linphone/LinphoneActivity.java
View file

@ -748,6 +748,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
public void displayChat(String sipUri) {
Log.e("===>>> displayChat");
if (getResources().getBoolean(R.bool.disable_chat)) {
return;
}