From 96f09b9f694a2a4a4679f3900f1f438ea1fc22f9 Mon Sep 17 00:00:00 2001
From: Tuomas Airaksinen <tuomas.airaksinen@vrt.fi>
Date: Sat, 11 Jan 2025 11:46:10 +0200
Subject: [PATCH 1/2] Fix sync issue if incompatible patch version has taken
 place

---
 app/src/main/java/net/bible/service/cloudsync/CloudSync.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt b/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt
index 242e248025..9668c60589 100644
--- a/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt
+++ b/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt
@@ -458,7 +458,11 @@ object CloudSync {
             val parentFolderId = it.parentId
             val folderWithMeta = folders[parentFolderId]!!
             val num = patchNumber(it.name)
-            if(versionNumber(it.name) > dbDef.version) throw IncompatiblePatchVersion()
+            if(versionNumber(it.name) > dbDef.version) {
+                // We need to load next time also last set of patches.
+                dbDef.dao.setConfig(LAST_SYNCHRONIZED_KEY, lastSynchronized)
+                throw IncompatiblePatchVersion()
+            }
             val existing = dbDef.dao.syncStatus(folderWithMeta.folder.name, patchNumber(it.name))
             if (existing == null && num > folderWithMeta.loadedCount) {
                 DriveFileWithMeta(it, folderWithMeta.folder.name)

From 873f87aa9bd34571da7473e848410dea9238be38 Mon Sep 17 00:00:00 2001
From: Tuomas Airaksinen <tuomas.airaksinen@vrt.fi>
Date: Mon, 3 Feb 2025 21:30:57 +0200
Subject: [PATCH 2/2] Increment version

---
 app/src/main/AndroidManifest.xml                |  4 ++--
 .../android/en-US/changelogs/5.0.841.txt        | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/5.0.841.txt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4043e24125..9927417fd8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="840"
-    android:versionName="5.0.840">
+    android:versionCode="841"
+    android:versionName="5.0.841">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/fastlane/metadata/android/en-US/changelogs/5.0.841.txt b/fastlane/metadata/android/en-US/changelogs/5.0.841.txt
new file mode 100644
index 0000000000..fc71807b40
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/5.0.841.txt
@@ -0,0 +1,17 @@
+- Settings & improvements for e-ink devices like Onyx Boox (#3354):
+   1) Setting to turn off animations
+   2) Setting to set app to monochrome mode
+   3) Setting to set a font multiplier
+   4) Setting to adjust swipe action in bible view
+
+5.0
+"What's new" video: https://youtu.be/bf33j4tLbxQ
+
+Highlights:
+- Support for EPUB electronic book format
+- Bookmarks for non-bible documents
+- Cloud synchronize (via Google drive currently)
+- MyBible / MySword modules
+
+See new AndBible website & blog: https://andbible.org
+Support development financially: https://shop.andbible.org/