Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 11:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved ActiveSync to the wizard menu

Browse Source
This commit is contained in:
M66B
2019-11-16 10:04:05 +01:00
parent 6b8151bfcf
commit a7b30f28e8
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -79,7 +79,6 @@ public class FragmentAccount extends FragmentBase {
private Button btnAutoConfig;
private ContentLoadingProgressBar pbAutoConfig;
private TextView tvActiveSyncSupport;
private EditText etHost;
private RadioGroup rgEncryption;
private CheckBox cbInsecure;
@@ -182,7 +181,6 @@ public class FragmentAccount extends FragmentBase {
btnAutoConfig = view.findViewById(R.id.btnAutoConfig);
pbAutoConfig = view.findViewById(R.id.pbAutoConfig);
tvActiveSyncSupport = view.findViewById(R.id.tvActiveSyncSupport);
etHost = view.findViewById(R.id.etHost);
etPort = view.findViewById(R.id.etPort);
rgEncryption = view.findViewById(R.id.rgEncryption);
@@ -283,14 +281,6 @@ public class FragmentAccount extends FragmentBase {
}
});
tvActiveSyncSupport.setPaintFlags(tvActiveSyncSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
tvActiveSyncSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Helper.viewFAQ(getContext(), 133);
}
});
btnAutoConfig.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

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

@@ -167,7 +167,8 @@ public class FragmentSetup extends FragmentBase {
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, 1, R.string.title_setup_gmail);
//popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_outlook, 2, R.string.title_setup_outlook);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_other, 3, R.string.title_setup_other);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_activesync, 3, R.string.title_setup_activesync);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_other, 4, R.string.title_setup_other);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
@@ -183,6 +184,9 @@ public class FragmentSetup extends FragmentBase {
case R.string.title_setup_outlook:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_OUTLOOK));
return true;
case R.string.title_setup_activesync:
Helper.viewFAQ(getContext(), 133);
return true;
case R.string.title_setup_other:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
return true;