From 5e31abb7b6a1c8ab37394efb8729f387dae830b1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 4 Jul 2024 07:24:46 +0200
Subject: [PATCH] Enable no-op for iCloud accounts

---
 app/src/main/java/eu/faircode/email/DB.java | 9 ++++++++-
 app/src/main/res/xml/providers.xml          | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index 1c935f5237..386bb9c183 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -70,7 +70,7 @@ import javax.mail.internet.InternetAddress;
 // https://developer.android.com/topic/libraries/architecture/room.html
 
 @Database(
-        version = 298,
+        version = 299,
         entities = {
                 EntityIdentity.class,
                 EntityAccount.class,
@@ -3032,6 +3032,13 @@ public abstract class DB extends RoomDatabase {
                         db.execSQL("DROP VIEW IF EXISTS `account_view`");
                         db.execSQL("CREATE VIEW IF NOT EXISTS `account_view` AS " + TupleAccountView.query);
                     }
+                }).addMigrations(new Migration(298, 299) {
+                    @Override
+                    public void migrate(@NonNull SupportSQLiteDatabase db) {
+                        logMigration(startVersion, endVersion);
+                        db.execSQL("UPDATE account SET keep_alive_noop = 1" +
+                                " WHERE host = 'imap.mail.me.com' AND pop = " + EntityAccount.TYPE_IMAP);
+                    }
                 }).addMigrations(new Migration(998, 999) {
                     @Override
                     public void migrate(@NonNull SupportSQLiteDatabase db) {
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 7b50786780..e87742b06a 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -718,6 +718,7 @@
         appPassword="true"
         domain="icloud\\.com,me\\.com,mac\\.com"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq148"
+        noop="true"
         user="local">
         <imap
             host="imap.mail.me.com"