From adfd7bacb01c1bc58a1247cf5b15a2416ab5bf60 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 20 Jun 2018 20:22:21 +0200 Subject: [PATCH] Fix potential bug with possible user id Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/CallController.java | 2 +- .../com/nextcloud/talk/controllers/ChatController.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 38d421369..d877bc0a7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -245,7 +245,7 @@ public class CallController extends BaseController { credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); isVoiceOnlyCall = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); - if (userEntity.getUserId().equals("-1")) { + if (userEntity.getUserId().equals("?")) { credentials = null; } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 608270331..8231eb1b2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -183,7 +183,7 @@ public class ChatController extends BaseController implements MessagesListAdapte if (!TextUtils.isEmpty(baseUrl)) { conversationUser.setBaseUrl(baseUrl); - conversationUser.setUserId("-1"); + conversationUser.setUserId("?"); conversationUser.setDisplayName(currentUser.getDisplayName()); } else { baseUrl = conversationUser.getBaseUrl(); @@ -191,7 +191,7 @@ public class ChatController extends BaseController implements MessagesListAdapte this.roomPassword = args.getString(BundleKeys.KEY_CONVERSATION_PASSWORD, ""); - if (conversationUser.getUserId().equals("-1")) { + if (conversationUser.getUserId().equals("?")) { credentials = null; } else { credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); @@ -572,7 +572,7 @@ public class ChatController extends BaseController implements MessagesListAdapte @Override public void onNext(GenericOverall genericOverall) { - if (conversationUser.getUserId().equals("-1") && TextUtils.isEmpty(myFirstMessage)) { + if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage)) { myFirstMessage = message; } @@ -588,7 +588,7 @@ public class ChatController extends BaseController implements MessagesListAdapte @Override public void onError(Throwable e) { if (e instanceof HttpException && ((HttpException) e).code() == 201) { - if (conversationUser.getUserId().equals("-1") && TextUtils.isEmpty(myFirstMessage)) { + if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage)) { myFirstMessage = message; } @@ -713,7 +713,7 @@ public class ChatController extends BaseController implements MessagesListAdapte } else { for (int i = 0; i < chatMessageList.size(); i++) { chatMessageList.get(i).setBaseUrl(conversationUser.getBaseUrl()); - if (conversationUser.getUserId().equals("-1") && !TextUtils.isEmpty(myFirstMessage)) { + if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage)) { ChatMessage chatMessage = chatMessageList.get(i); if (chatMessage.getActorType().equals("guests") && chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {