From c819a6ef58eea1b4ae3e9961920499f72dde9027 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Fri, 29 Sep 2017 13:55:59 +0200 Subject: [PATCH] [ChatList] fix last chatMessage display problem + gsu --- src/android/org/linphone/ChatFragment.java | 7 ++++--- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/mswebrtc | 2 +- submodules/oRTP | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java index 1453fa321..1df536951 100644 --- a/src/android/org/linphone/ChatFragment.java +++ b/src/android/org/linphone/ChatFragment.java @@ -1484,9 +1484,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } - - - if (externalBodyUrl != null || fileTransferContent != null) { String appData = message.getAppData(); @@ -1530,6 +1527,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC loadBitmap(appData, holder.messageImage); holder.messageImage.setTag(message.getAppData()); } + //displayMessageList(); } } } @@ -1842,6 +1840,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView); if (this == bitmapWorkerTask && imageView != null) { imageView.setImageBitmap(bitmap); + //Force scroll too bottom with setSelection() after image loaded and last messages + if(((messagesList.getLastVisiblePosition() >= (getCount() - 1)) && (messagesList.getFirstVisiblePosition() <= (getCount() - 1)))) + messagesList.setSelection(getCount() - 1); imageView.setTag(path); imageView.setOnClickListener(new OnClickListener() { @Override diff --git a/submodules/linphone b/submodules/linphone index f28d968a6..ddd080522 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f28d968a67eab65e07e60ef8a8b19621c6401e82 +Subproject commit ddd08052226c879df63b08ab11d4a4917cfc1da5 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index d765c5b94..6b78f9562 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit d765c5b947f2de52d97061e80784091ec043f5a0 +Subproject commit 6b78f95624660c4e1160c3caac74732250321ce1 diff --git a/submodules/mswebrtc b/submodules/mswebrtc index 475eb67b5..198143488 160000 --- a/submodules/mswebrtc +++ b/submodules/mswebrtc @@ -1 +1 @@ -Subproject commit 475eb67b5cb8d82f6636e69c3bde8b18daeb824e +Subproject commit 19814348807cdab7f13637993a05a696f47685eb diff --git a/submodules/oRTP b/submodules/oRTP index e9c2d48c9..ce3dedb58 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit e9c2d48c917d78c529eefb9f824ae52238f950d4 +Subproject commit ce3dedb58706f154c647bc99412aca8a42416d9d