gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential bug with possible user id

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-20 20:22:21 +02:00
parent 078115d478
commit adfd7bacb0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -245,7 +245,7 @@ public class CallController extends BaseController {
credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
isVoiceOnlyCall = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); isVoiceOnlyCall = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false);
if (userEntity.getUserId().equals("-1")) { if (userEntity.getUserId().equals("?")) {
credentials = null; credentials = null;
} }

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

@ -183,7 +183,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (!TextUtils.isEmpty(baseUrl)) { if (!TextUtils.isEmpty(baseUrl)) {
conversationUser.setBaseUrl(baseUrl); conversationUser.setBaseUrl(baseUrl);
conversationUser.setUserId("-1"); conversationUser.setUserId("?");
conversationUser.setDisplayName(currentUser.getDisplayName()); conversationUser.setDisplayName(currentUser.getDisplayName());
} else { } else {
baseUrl = conversationUser.getBaseUrl(); baseUrl = conversationUser.getBaseUrl();
@ -191,7 +191,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
this.roomPassword = args.getString(BundleKeys.KEY_CONVERSATION_PASSWORD, ""); this.roomPassword = args.getString(BundleKeys.KEY_CONVERSATION_PASSWORD, "");
if (conversationUser.getUserId().equals("-1")) { if (conversationUser.getUserId().equals("?")) {
credentials = null; credentials = null;
} else { } else {
credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken());
@ -572,7 +572,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
if (conversationUser.getUserId().equals("-1") && TextUtils.isEmpty(myFirstMessage)) { if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage)) {
myFirstMessage = message; myFirstMessage = message;
} }
@ -588,7 +588,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
if (e instanceof HttpException && ((HttpException) e).code() == 201) { 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; myFirstMessage = message;
} }
@ -713,7 +713,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} else { } else {
for (int i = 0; i < chatMessageList.size(); i++) { for (int i = 0; i < chatMessageList.size(); i++) {
chatMessageList.get(i).setBaseUrl(conversationUser.getBaseUrl()); 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); ChatMessage chatMessage = chatMessageList.get(i);
if (chatMessage.getActorType().equals("guests") && if (chatMessage.getActorType().equals("guests") &&
chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) { chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {