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

Merge pull request #3454 from nextcloud/bugfix/noid/deleteUserWhenUnregisterForNotificationsFailed

Browse Source 
Fix to delete user when unregister for notifications failed
This commit is contained in:
Marcel Hibbe 2023-11-21 10:37:36 +01:00 committed by GitHub
commit fc42fe9551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
View File

@ -129,6 +129,7 @@ public class AccountRemovalWorker extends Worker {
@Override @Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "error while trying to unregister Device For Notifications", e); Log.e(TAG, "error while trying to unregister Device For Notifications", e);
initiateUserDeletion(user);
} }
@Override @Override
@ -137,7 +138,7 @@ public class AccountRemovalWorker extends Worker {
} }
}); });
} else { } else {
deleteUser(user); initiateUserDeletion(user);
} }
} }
@ -172,15 +173,13 @@ public class AccountRemovalWorker extends Worker {
} }
} }
if (user.getId() != null) { initiateUserDeletion(user);
WebSocketConnectionHelper.deleteExternalSignalingInstanceForUserEntity(user.getId());
}
deleteAllEntriesForAccountIdentifier(user);
} }
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Log.e(TAG, "error while trying to unregister Device For Notification With Proxy", e); Log.e(TAG, "error while trying to unregister Device For Notification With Proxy", e);
initiateUserDeletion(user);
} }
@Override @Override
@ -190,8 +189,10 @@ public class AccountRemovalWorker extends Worker {
}); });
} }
private void deleteAllEntriesForAccountIdentifier(User user) { private void initiateUserDeletion(User user) {
if (user.getId() != null) { if (user.getId() != null) {
WebSocketConnectionHelper.deleteExternalSignalingInstanceForUserEntity(user.getId());
try { try {
arbitraryStorageManager.deleteAllEntriesForAccountIdentifier(user.getId()); arbitraryStorageManager.deleteAllEntriesForAccountIdentifier(user.getId());
deleteUser(user); deleteUser(user);