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

replaced java8 compatible code with java7 compatible code #1005

Merged
merged 3 commits into from
May 9, 2024
Merged

replaced java8 compatible code with java7 compatible code #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5926320
replaced java8 compatible code with java7 compatible code
sacOO7 May 7, 2024
c609248
Fixed emulator CI file according to official doc recommendation
sacOO7 May 7, 2024
f6ace62
Increased timeout to fix flaky test
sacOO7 May 8, 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
11 changes: 9 additions & 2 deletions .github/workflows/emulate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
android-api-level: [ 19, 21, 24, 29 ]

steps:
- uses: actions/checkout@v3
- name: checkout
uses: actions/checkout@v4

- name: Enable KVM
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm

- uses: reactivecircus/android-emulator-runner@v2
with:
Expand Down
6 changes: 5 additions & 1 deletion lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,11 @@ public void transferToChannelQueue(List<ConnectionManager.QueuedMessage> queuedM
for (Channel channel : map.values()) {
if (channel.state.isReattachable()) {
Log.d(TAG, "reAttach(); channel = " + channel.name);
channel.transferQueuedPresenceMessages(channelQueueMap.getOrDefault(channel.name, null));
if (channelQueueMap.containsKey(channel.name)){
channel.transferQueuedPresenceMessages(channelQueueMap.get(channel.name));
} else {
channel.transferQueuedPresenceMessages(null);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ public void channel_invalid_resume_reattach_channels() throws AblyException {

AblyRealtime finalAbly = ably;
Exception conditionError = new Helpers.ConditionalWaiter().
wait(() -> finalAbly.connection.connectionManager.msgSerial == 0, 5000);
wait(() -> finalAbly.connection.connectionManager.msgSerial == 0, 10000);
assertNull(conditionError);

attachedChannelWaiter.waitFor(ChannelState.attaching, ChannelState.attached);
Expand Down
Loading