refactor check if token should be registered

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-01-18 13:06:51 +01:00
parent 1bd28f5ef4
commit b339aa9d33
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B

View File

@ -245,9 +245,12 @@ public class PushUtils {
accountPushData = null;
}
if (((TextUtils.isEmpty(providerValue) || accountPushData == null)
&& !userEntity.getScheduledForDeletion()) ||
(accountPushData != null && !accountPushData.getPushToken().equals(token) && !userEntity.getScheduledForDeletion())) {
boolean userHasNoPushData = (TextUtils.isEmpty(providerValue) || accountPushData == null);
boolean userIsNotMarkedForDeletion = !userEntity.getScheduledForDeletion();
boolean tokenHasChanged =
accountPushData != null && !accountPushData.getPushToken().equals(token);
if (userIsNotMarkedForDeletion && (userHasNoPushData || tokenHasChanged)) {
Map<String, String> nextcloudRegisterPushMap = new HashMap<>();
nextcloudRegisterPushMap.put("format", "json");