gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-14 08:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix guest author location

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-02-14 04:46:43 +01:00
parent 328c8e0c2d
commit 6b204b5165
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -157,6 +157,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
private boolean wasDetached; private boolean wasDetached;
private EmojiPopup emojiPopup; private EmojiPopup emojiPopup;
private CharSequence myFirstMessage;
public ChatController(Bundle args) { public ChatController(Bundle args) {
super(args); super(args);
setHasOptionsMenu(true); setHasOptionsMenu(true);
@ -675,6 +677,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
myFirstMessage = message;
if (popupBubble != null && popupBubble.isShown()) { if (popupBubble != null && popupBubble.isShown()) {
popupBubble.hide(); popupBubble.hide();
} }
@ -689,6 +693,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (e instanceof HttpException) { if (e instanceof HttpException) {
int code = ((HttpException) e).code(); int code = ((HttpException) e).code();
if (Integer.toString(code).startsWith("2")) { if (Integer.toString(code).startsWith("2")) {
myFirstMessage = message;
if (popupBubble != null && popupBubble.isShown()) { if (popupBubble != null && popupBubble.isShown()) {
popupBubble.hide(); popupBubble.hide();
} }
@ -878,6 +884,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
chatMessage.setBaseUrl(conversationUser.getBaseUrl()); chatMessage.setBaseUrl(conversationUser.getBaseUrl());
chatMessageList.get(i).setActiveUserId(conversationUser.getUserId()); chatMessageList.get(i).setActiveUserId(conversationUser.getUserId());
if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage.toString())) {
if (chatMessage.getActorType().equals("guests")) {
conversationUser.setUserId(chatMessage.getActorId());
setSenderId();
}
}
boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0 || boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0 ||
(adapter != null && adapter.getItemCount() == 0); (adapter != null && adapter.getItemCount() == 0);