From 4e31cd588d551253bd02099aa4e6d3a82149baed Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Tue, 28 Sep 2021 13:07:10 +0200 Subject: [PATCH 1/3] App may not start in 1.6.0 #4919 - Fixed --- Riot/Managers/PushNotification/PushNotificationService.m | 2 +- changelog.d/4919.bugfix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/4919.bugfix diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m index bef062452..05b2d8b3e 100644 --- a/Riot/Managers/PushNotification/PushNotificationService.m +++ b/Riot/Managers/PushNotification/PushNotificationService.m @@ -579,7 +579,7 @@ Matrix session observer used to detect new opened sessions. dispatch_group_enter(dispatchGroup); // Not continuing in completion block here, because PushKit mandates reporting a new call in the same run loop. // 'handleBackgroundSyncCacheIfRequiredWithCompletion' is processing to-device events synchronously. - [session handleBackgroundSyncCacheIfRequiredWithCompletion:^{ + [session handleBackgroundSyncCacheIfRequiredAndShouldUpdateSpaces:NO completion:^{ dispatch_group_leave(dispatchGroup); }]; diff --git a/changelog.d/4919.bugfix b/changelog.d/4919.bugfix new file mode 100644 index 000000000..c364a0603 --- /dev/null +++ b/changelog.d/4919.bugfix @@ -0,0 +1 @@ +fixed App may not start in 1.6.0 \ No newline at end of file From 7d9012530955f167077ce901c2f9ffe1223c4116 Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Tue, 28 Sep 2021 14:45:34 +0200 Subject: [PATCH 2/3] App may not start in 1.6.0 #4919 - Update after review --- Riot/Managers/PushNotification/PushNotificationService.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m index 05b2d8b3e..267c808d6 100644 --- a/Riot/Managers/PushNotification/PushNotificationService.m +++ b/Riot/Managers/PushNotification/PushNotificationService.m @@ -577,9 +577,11 @@ Matrix session observer used to detect new opened sessions. dispatch_group_t dispatchGroup = dispatch_group_create(); dispatch_group_enter(dispatchGroup); + session.updateSpaces = NO; // Not continuing in completion block here, because PushKit mandates reporting a new call in the same run loop. // 'handleBackgroundSyncCacheIfRequiredWithCompletion' is processing to-device events synchronously. - [session handleBackgroundSyncCacheIfRequiredAndShouldUpdateSpaces:NO completion:^{ + [session handleBackgroundSyncCacheIfRequiredWithCompletion:^{ + session.updateSpaces = YES; dispatch_group_leave(dispatchGroup); }]; From 694dcfc8910bf28422b0b0bf274fef911b9d5bd7 Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Tue, 28 Sep 2021 15:22:30 +0200 Subject: [PATCH 3/3] App may not start in 1.6.0 #4919 - Update after review --- Riot/Managers/PushNotification/PushNotificationService.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m index 267c808d6..5edec7a00 100644 --- a/Riot/Managers/PushNotification/PushNotificationService.m +++ b/Riot/Managers/PushNotification/PushNotificationService.m @@ -577,11 +577,11 @@ Matrix session observer used to detect new opened sessions. dispatch_group_t dispatchGroup = dispatch_group_create(); dispatch_group_enter(dispatchGroup); - session.updateSpaces = NO; + session.spaceService.graphUpdateEnabled = NO; // Not continuing in completion block here, because PushKit mandates reporting a new call in the same run loop. // 'handleBackgroundSyncCacheIfRequiredWithCompletion' is processing to-device events synchronously. [session handleBackgroundSyncCacheIfRequiredWithCompletion:^{ - session.updateSpaces = YES; + session.spaceService.graphUpdateEnabled = YES; dispatch_group_leave(dispatchGroup); }];