Reassurance

FAQ.md

@@ -1274,6 +1274,8 @@ Using the search index is a pro feature.
 >
 > It takes just two minutes to be prepared.
 >
+> If the app said your Outlook accounts will continue to work, you don't need to do anything.
+>
 
 <br />
 

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -5907,6 +5907,7 @@ public class FragmentMessages extends FragmentBase
         final Context context = getContext();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         long outlook_last_checked = prefs.getLong("outlook_last_checked", 0);
+        boolean outlook_checked = prefs.getBoolean("outlook_checked", false);
 
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.MILLISECOND, 0);
@@ -5944,29 +5945,43 @@ public class FragmentMessages extends FragmentBase
 
             @Override
             protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
+                int oauth = 0;
                 int passwd = 0;
                 if (accounts != null)
                     for (EntityAccount account : accounts)
-                        if (account.isOutlook() &&
+                        if (account.isOutlook())
-                                account.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD)
+                            if (account.auth_type == ServiceAuthenticator.AUTH_TYPE_OAUTH)
+                                oauth++;
+                            else if (account.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD)
                                 passwd++;
 
-                if (passwd == 0)
+                if (oauth + passwd == 0)
+                    return;
+
+                if (oauth > 0 && passwd == 0 && outlook_checked)
                     return;
 
-                final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_check_outlook_password, Snackbar.LENGTH_INDEFINITE));
+                boolean checked = (passwd == 0);
+                int resid = (checked ? R.string.title_check_outlook_oauth : R.string.title_check_outlook_password);
+                final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, resid, Snackbar.LENGTH_INDEFINITE));
                 Helper.setSnackbarLines(snackbar, 5);
                 snackbar.setAction(R.string.title_info, new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         snackbar.dismiss();
-                        Helper.viewFAQ(v.getContext(), 14);
+                        if (checked)
+                            prefs.edit().putBoolean("outlook_checked", true).apply();
+                        else
                             prefs.edit().putLong("outlook_last_checked", now).apply();
+                        Helper.viewFAQ(v.getContext(), 14);
                     }
                 });
                 snackbar.addCallback(new Snackbar.Callback() {
                     @Override
                     public void onDismissed(Snackbar transientBottomBar, int event) {
+                        if (checked)
+                            prefs.edit().putBoolean("outlook_checked", true).apply();
+                        else
                             prefs.edit().putLong("outlook_last_checked", now).apply();
                     }
                 });

app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java

@@ -334,7 +334,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             "junk_hint",
             "last_update_check", "last_announcement_check",
             "motd",
-            "outlook_last_checked"
+            "outlook_last_checked", "outlook_checked"
     };
 
     @Override

app/src/main/res/values/strings.xml

@@ -398,7 +398,7 @@
     <string name="title_check_gmail_oauth">Your Gmail accounts will continue to work after May 30, 2022</string>
     <string name="title_check_gmail_password">Some of your Gmail accounts may stop working after May 30, 2022</string>
 
-    <string name="title_check_outlook_oauth" translatable="false">Your Outlook accounts will continue to work after September 16, 2024</string>
+    <string name="title_check_outlook_oauth">Your Outlook accounts will continue to work after September 16, 2024</string>
     <string name="title_check_outlook_password">Some of your Outlook/Hotmail/Live accounts will stop working after September 16, 2024</string>
 
     <string name="title_advanced_hint_title">More advanced options</string>