From 3e6b5f838267ee61319aa7acd076858cef9b3a07 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 6 Sep 2018 20:30:01 +0200 Subject: [PATCH] Fix #292 --- .idea/misc.xml | 10 ++++------ .../talk/controllers/CallNotificationController.java | 2 +- .../com/nextcloud/talk/controllers/ChatController.java | 2 +- .../nextcloud/talk/controllers/ContactsController.java | 2 +- .../talk/controllers/ConversationsListController.java | 2 +- .../nextcloud/talk/controllers/SettingsController.java | 2 +- .../com/nextcloud/talk/jobs/AccountRemovalWorker.java | 2 +- .../com/nextcloud/talk/jobs/NotificationWorker.java | 2 +- .../talk/presenters/MentionAutocompletePresenter.java | 2 +- .../main/java/com/nextcloud/talk/utils/PushUtils.java | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 0e3b8d65b..cc51e58ed 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ @@ -30,7 +31,4 @@ - - \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 42b827788..91169e31a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -156,7 +156,7 @@ public class CallNotificationController extends BaseController { this.originalBundle = args; - credentials = ApiUtils.getCredentials(userBeingCalled.getUserId(), userBeingCalled.getToken()); + credentials = ApiUtils.getCredentials(userBeingCalled.getUsername(), userBeingCalled.getToken()); } @Override 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 46174b540..881e55f96 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -200,7 +200,7 @@ public class ChatController extends BaseController implements MessagesListAdapte if (conversationUser.getUserId().equals("?")) { credentials = null; } else { - credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); + credentials = ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken()); } if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 735c5fa75..a32cf6793 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -208,7 +208,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ currentUser = userUtils.getCurrentUser(); if (currentUser != null) { - credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); + credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()); } if (adapter == null) { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index a0f262ab7..5f987a40f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -183,7 +183,7 @@ public class ConversationsListController extends BaseController implements Searc currentUser = userUtils.getCurrentUser(); if (currentUser != null) { - credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); + credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()); } if (currentUser != null) { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 0d1cccc9d..7e85de85f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -182,7 +182,7 @@ public class SettingsController extends BaseController { private void getCurrentUser() { currentUser = userUtils.getCurrentUser(); - credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); + credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()); } @Override diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java index c57c81a2c..be4f9b2c3 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java @@ -84,7 +84,7 @@ public class AccountRemovalWorker extends Worker { PushConfigurationState.class); PushConfigurationState finalPushConfigurationState = pushConfigurationState; - credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken()); + credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new JavaNetCookieJar(new CookieManager())).build()).build().create(NcApi.class); diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 23d6452cd..04b627526 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -402,7 +402,7 @@ public class NotificationWorker extends Worker { decryptedPushMessage = LoganSquare.parse(new String(decryptedSubject), DecryptedPushMessage.class); - credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUserId(), + credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUsername(), signatureVerification.getUserEntity().getToken()); ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java index 375bfd7b9..e288e1940 100644 --- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java +++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java @@ -93,7 +93,7 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter if (!TextUtils.isEmpty(query)) { adapter.setFilter(query.toString()); - ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUserId(), currentUser + ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUsername(), currentUser .getToken()), ApiUtils.getUrlForMentionSuggestions(currentUser.getBaseUrl(), roomToken), query.toString(), null) .subscribeOn(Schedulers.newThread()) diff --git a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java index ae96ba2c8..480bef904 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java @@ -260,7 +260,7 @@ public class PushUtils { queryMap.put("devicePublicKey", publicKey); queryMap.put("proxyServer", proxyServer); - credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken()); + credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); String finalCredentials = credentials; ncApi.registerDeviceForNotificationsWithNextcloud(