From 4620c7e6f936557f2d5a226190f1b562c993c570 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:48:55 +0200
Subject: [PATCH] Disable keep-alive-noop for Outlook again

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

diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index 7dc5e799ba..3014fefcf6 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -3052,6 +3052,8 @@ public abstract class DB extends RoomDatabase {
                         logMigration(startVersion, endVersion);
                         db.execSQL("UPDATE account SET keep_alive_noop = 0" +
                                 " WHERE host = 'imap.gmail.com' AND pop = " + EntityAccount.TYPE_IMAP);
+                        db.execSQL("UPDATE account SET keep_alive_noop = 0" +
+                                " WHERE host = 'outlook.office365.com' AND pop = " + EntityAccount.TYPE_IMAP);
                     }
                 }).addMigrations(new Migration(998, 999) {
                     @Override
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index be0b811851..1f25a623ee 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -69,7 +69,6 @@
         domain="live\\..*"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="3"
         partial="false"
         useip="false">
@@ -90,7 +89,6 @@
         domain="hotmail\\..*"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="4"
         partial="false"
         useip="false">
@@ -124,7 +122,6 @@
         id="office365"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="5"
         partial="false"
         useip="false">
@@ -163,7 +160,6 @@
         id="office365pcke"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="5"
         partial="false"
         useip="false">
@@ -204,7 +200,6 @@
         id="outlookgraph"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="6"
         partial="false"
         useip="false">
@@ -257,7 +252,6 @@
         id="outlook"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         maxtls="1.2"
-        noop="true"
         order="5"
         partial="false"
         useip="false">