mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added Outlook to wizard menu

This commit is contained in:
M66B 2020-05-28 10:13:29 +02:00
parent 99e81cfa2b
commit 414b787d5e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -167,10 +167,11 @@ public class FragmentSetup extends FragmentBase {
int order = 1; int order = 1;
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, order++, R.string.title_setup_gmail); popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, order++, R.string.title_setup_gmail);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_outlook, order++, R.string.title_setup_outlook);
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG) if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
for (EmailProvider provider : EmailProvider.loadProfiles(getContext())) for (EmailProvider provider : EmailProvider.loadProfiles(getContext()))
if (provider.oauth != null && (provider.oauth.enabled || BuildConfig.DEBUG)) if (provider.oauth != null && provider.oauth.enabled)
popupMenu.getMenu() popupMenu.getMenu()
.add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.name)) .add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.name))
.setIntent(new Intent(ActivitySetup.ACTION_QUICK_OAUTH) .setIntent(new Intent(ActivitySetup.ACTION_QUICK_OAUTH)
@ -195,6 +196,7 @@ public class FragmentSetup extends FragmentBase {
case R.string.title_setup_activesync: case R.string.title_setup_activesync:
Helper.viewFAQ(getContext(), 133); Helper.viewFAQ(getContext(), 133);
return true; return true;
case R.string.title_setup_outlook:
case R.string.title_setup_other: case R.string.title_setup_other:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP)); lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
return true; return true;

1
app/src/main/res/values/strings.xml
View File

@ -156,6 +156,7 @@
<string name="title_setup_wizard_multiple">The installation wizard can be used multiple times to set up multiple accounts</string> <string name="title_setup_wizard_multiple">The installation wizard can be used multiple times to set up multiple accounts</string>
<string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string> <string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
<string name="title_setup_gmail" translatable="false">Gmail</string> <string name="title_setup_gmail" translatable="false">Gmail</string>
<string name="title_setup_outlook" translatable="false">Outlook</string>
<string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string> <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
<string name="title_setup_activesync" translatable="false">Exchange ActiveSync</string> <string name="title_setup_activesync" translatable="false">Exchange ActiveSync</string>
<string name="title_setup_other">Other provider</string> <string name="title_setup_other">Other provider</string>