mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-17 01:35:03 +01:00
Fix guest reconnection
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
6b204b5165
commit
309f5d30c2
@ -884,7 +884,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
||||
chatMessage.setBaseUrl(conversationUser.getBaseUrl());
|
||||
chatMessageList.get(i).setActiveUserId(conversationUser.getUserId());
|
||||
|
||||
if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage.toString())) {
|
||||
// if credentials are empty, we're acting as a guest
|
||||
if (TextUtils.isEmpty(credentials) && !TextUtils.isEmpty(myFirstMessage.toString())) {
|
||||
if (chatMessage.getActorType().equals("guests")) {
|
||||
conversationUser.setUserId(chatMessage.getActorId());
|
||||
setSenderId();
|
||||
|
@ -644,6 +644,7 @@ public class OperationsMenuController extends BaseController {
|
||||
|
||||
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, conversationUser);
|
||||
bundle.putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(call));
|
||||
bundle.putString(BundleKeys.KEY_CONVERSATION_PASSWORD, callPassword);
|
||||
|
||||
conversationIntent.putExtras(bundle);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user