浏览代码

refactor check if token should be registered

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 3 年之前
父节点
当前提交
b339aa9d33
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      app/src/main/java/com/nextcloud/talk/utils/PushUtils.java

+ 6 - 3
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java

@@ -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");