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

also register push token again on server&proxy no matter if it didn't change on device

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-01-18 13:49:44 +01:00
parent b339aa9d33
commit aacd6d5377
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java
View File

@ -229,29 +229,10 @@ public class PushUtils {
devicePublicKeyBase64 = "-----BEGIN PUBLIC KEY-----\n" + devicePublicKeyBase64 + "\n-----END PUBLIC KEY-----\n"; devicePublicKeyBase64 = "-----BEGIN PUBLIC KEY-----\n" + devicePublicKeyBase64 + "\n-----END PUBLIC KEY-----\n";
if (userUtils.anyUserExists()) { if (userUtils.anyUserExists()) {
String providerValue;
PushConfigurationState accountPushData = null;
for (Object userEntityObject : userUtils.getUsers()) { for (Object userEntityObject : userUtils.getUsers()) {
UserEntity userEntity = (UserEntity) userEntityObject; UserEntity userEntity = (UserEntity) userEntityObject;
providerValue = userEntity.getPushConfigurationState();
if (!TextUtils.isEmpty(providerValue)) {
try {
accountPushData = LoganSquare.parse(providerValue, PushConfigurationState.class);
} catch (IOException e) {
Log.d(TAG, "Failed to parse account push data");
accountPushData = null;
}
} else {
accountPushData = null;
}
boolean userHasNoPushData = (TextUtils.isEmpty(providerValue) || accountPushData == null);
boolean userIsNotMarkedForDeletion = !userEntity.getScheduledForDeletion();
boolean tokenHasChanged =
accountPushData != null && !accountPushData.getPushToken().equals(token);
if (userIsNotMarkedForDeletion && (userHasNoPushData || tokenHasChanged)) {
if (!userEntity.getScheduledForDeletion()) {
Map<String, String> nextcloudRegisterPushMap = new HashMap<>(); Map<String, String> nextcloudRegisterPushMap = new HashMap<>();
nextcloudRegisterPushMap.put("format", "json"); nextcloudRegisterPushMap.put("format", "json");
nextcloudRegisterPushMap.put("pushTokenHash", pushTokenHash); nextcloudRegisterPushMap.put("pushTokenHash", pushTokenHash);