Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDK-4009] Refactoring presence #1870

Merged
merged 15 commits into from
Mar 14, 2024
Merged

[SDK-4009] Refactoring presence #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8836055
Refactoring presence:
maratal Mar 9, 2024
93716bb
Moved `sync` method into the test suit.
maratal Mar 8, 2024
50b9b01
Renamed channel's `serial` to `channelSerial`.
maratal Dec 21, 2023
39d574c
Renamed presence map's localMembers to internalMembers (that's the te…
maratal Dec 22, 2023
91fb495
Merge pull request #1865 from ably/fix/1852-rename-channel-serial
maratal Mar 9, 2024
b301249
Merge pull request #1866 from ably/fix/1849-rename-localMembers
maratal Mar 9, 2024
74c5fd3
Re-enabled some skipped tests (marked them temporarily as FLAKY for q…
maratal Mar 10, 2024
24f1b00
Among 23 unskipped flaky tests skipped back 11 of them due to fail mo…
maratal Mar 11, 2024
818df65
Removed FLAKY label from skipped tests.
maratal Mar 11, 2024
b5e78cb
Setting `connectionId` of embed messages.
maratal Mar 11, 2024
1d2bec6
Removed unused variables.
maratal Mar 11, 2024
51a00d2
Moved `isLastChannelSerial` to the presence impl file.
maratal Mar 11, 2024
a5a7679
Removed extra call to `cleanUpAbsentMembers`.
maratal Mar 11, 2024
34a9eeb
Merge pull request #1886 from ably/fix/1876-re-enable-skipped-presenc…
maratal Mar 13, 2024
cb04f96
Simplified `syncComplete` evaluation expression.
maratal Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions Ably.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source/ARTConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ - (NSString *)createRecoveryKey_nosync {
NSMutableDictionary<NSString *, NSString *> *channelSerials = [NSMutableDictionary new];
for (ARTRealtimeChannelInternal *const channel in _realtime.channels.nosyncIterable) {
if (channel.state_nosync == ARTRealtimeChannelAttached) {
channelSerials[channel.name] = channel.serial;
channelSerials[channel.name] = channel.channelSerial;
}
}

Expand Down
228 changes: 0 additions & 228 deletions Source/ARTPresenceMap.m
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Source/ARTRealtime.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#import "ARTWebSocketTransport+Private.h"
#import "ARTOSReachability.h"
#import "ARTNSArray+ARTFunctional.h"
#import "ARTPresenceMap.h"
#import "ARTProtocolMessage.h"
#import "ARTProtocolMessage+Private.h"
#import "ARTEventEmitter+Private.h"
Expand Down Expand Up @@ -254,7 +253,7 @@ - (instancetype)initWithOptions:(ARTClientOptions *)options {
_msgSerial = recoveryKey.msgSerial; // RTN16f
for (NSString *const channelName in recoveryKey.channelSerials) {
ARTRealtimeChannelInternal *const channel = [_channels get:channelName];
channel.serial = recoveryKey.channelSerials[channelName]; // RTN16j
channel.channelSerial = recoveryKey.channelSerials[channelName]; // RTN16j
}
}
}
Expand Down
Loading
Loading