From 7997435003b8b77e40b7ba9101854488f8c2a597 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 23 Feb 2022 11:23:05 +0000
Subject: [PATCH 1/2] Also record `next_batch`

---
 .../org/matrix/android/sdk/internal/session/sync/SyncTask.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 83e8cfb709..b4da1a02cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -163,7 +163,10 @@ internal class DefaultSyncTask @Inject constructor(
             }
             val nbRooms = syncResponse.rooms?.invite.orEmpty().size + syncResponse.rooms?.join.orEmpty().size + syncResponse.rooms?.leave.orEmpty().size
             val nbToDevice = syncResponse.toDevice?.events.orEmpty().size
-            Timber.tag(loggerTag.value).d("Incremental sync request parsing, $nbRooms room(s) $nbToDevice toDevice(s)")
+            val nextBatch = syncResponse.nextBatch
+            Timber.tag(loggerTag.value).d(
+                "Incremental sync request parsing, $nbRooms room(s) $nbToDevice toDevice(s). Got nextBatch: $nextBatch"
+            )
             defaultSyncStatusService.setStatus(SyncStatusService.Status.IncrementalSyncParsing(
                     rooms = nbRooms,
                     toDevice = nbToDevice

From 10b07c35a07bd948b5c274a522c894833bc9a5ae Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 23 Feb 2022 11:24:47 +0000
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/5312.misc | 2 +-
 changelog.d/5318.misc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/5318.misc

diff --git a/changelog.d/5312.misc b/changelog.d/5312.misc
index db54c5afd2..d724f1ba3f 100644
--- a/changelog.d/5312.misc
+++ b/changelog.d/5312.misc
@@ -1 +1 @@
-Log the `since` token used when doing an incremental sync.
+Log the `since` token used and `next_batch` token returned when doing an incremental sync.
diff --git a/changelog.d/5318.misc b/changelog.d/5318.misc
new file mode 100644
index 0000000000..d724f1ba3f
--- /dev/null
+++ b/changelog.d/5318.misc
@@ -0,0 +1 @@
+Log the `since` token used and `next_batch` token returned when doing an incremental sync.