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

Fix guest reconnection

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-02-14 04:59:45 +01:00
parent 6b204b5165
commit 309f5d30c2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,7 +884,8 @@ 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 credentials are empty, we're acting as a guest
if (TextUtils.isEmpty(credentials) && !TextUtils.isEmpty(myFirstMessage.toString())) {
if (chatMessage.getActorType().equals("guests")) { if (chatMessage.getActorType().equals("guests")) {
conversationUser.setUserId(chatMessage.getActorId()); conversationUser.setUserId(chatMessage.getActorId());
setSenderId(); setSenderId();

1
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -644,6 +644,7 @@ public class OperationsMenuController extends BaseController {
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, conversationUser); bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, conversationUser);
bundle.putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(call)); bundle.putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(call));
bundle.putString(BundleKeys.KEY_CONVERSATION_PASSWORD, callPassword);
conversationIntent.putExtras(bundle); conversationIntent.putExtras(bundle);