From 9882ddc5369fdbb41d02dacabf39c493471a67be Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 10 Mar 2023 11:05:51 +0100 Subject: [PATCH] Fix logic in workers when user was not found Signed-off-by: Marcel Hibbe --- .../main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java | 4 ++-- .../java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java index ba20aab32..4fe5c4f32 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java @@ -112,9 +112,9 @@ public class CapabilitiesWorker extends Worker { long internalUserId = data.getLong(BundleKeys.KEY_INTERNAL_USER_ID, -1); List userEntityObjectList = new ArrayList<>(); - boolean userExists = userManager.getUserWithInternalId(internalUserId).isEmpty().blockingGet(); + boolean userNotFound = userManager.getUserWithInternalId(internalUserId).isEmpty().blockingGet(); - if (internalUserId == -1 || !userExists) { + if (internalUserId == -1 || userNotFound) { userEntityObjectList = userManager.getUsers().blockingGet(); } else { userEntityObjectList.add(userManager.getUserWithInternalId(internalUserId).blockingGet()); diff --git a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java index cdaf5a92f..e69b70ce4 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java @@ -77,9 +77,9 @@ public class SignalingSettingsWorker extends Worker { long internalUserId = data.getLong(BundleKeys.KEY_INTERNAL_USER_ID, -1); List userEntityObjectList = new ArrayList<>(); - boolean userExists = userManager.getUserWithInternalId(internalUserId).isEmpty().blockingGet(); + boolean userNotFound = userManager.getUserWithInternalId(internalUserId).isEmpty().blockingGet(); - if (internalUserId == -1 || !userExists) { + if (internalUserId == -1 || userNotFound) { userEntityObjectList = userManager.getUsers().blockingGet(); } else { userEntityObjectList.add(userManager.getUserWithInternalId(internalUserId).blockingGet());