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

Moved ActiveSync to the wizard menu

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
Show Stats 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;

15
app/src/main/res/layout/fragment_account.xml
View File

@ -101,19 +101,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnAutoConfig" />
<TextView
android:id="@+id/tvActiveSyncSupport"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:drawableEnd="@drawable/baseline_open_in_new_24"
android:drawablePadding="6dp"
android:text="@string/title_activesync_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImap" />
<!-- host -->
<TextView
@ -124,7 +111,7 @@
android:text="@string/title_host"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvActiveSyncSupport" />
app:layout_constraintTop_toBottomOf="@id/tvImap" />
<EditText
android:id="@+id/etHost"

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

@ -138,6 +138,7 @@
<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_outlook" translatable="false">Outlook</string>
<string name="title_setup_activesync" translatable="false">Exchange ActiveSync</string>
<string name="title_setup_other">Other provider</string>
<string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string>
<string name="title_setup_gmail_rationale">Please grant permissions to select an account and read your name</string>
@ -473,7 +474,6 @@
<string name="title_sign_key">Sign key: %1$s</string>
<string name="title_last_connected">Last connected: %1$s</string>
<string name="title_pop_support">The POP3 protocol supports downloading and deleting messages from the inbox only. POP3 cannot mark messages as read, move messages, etc. POP3 will use more battery power and data than IMAP. So, consider using the IMAP protocol whenever possible.</string>
<string name="title_activesync_support">ActiveSync is not supported</string>
<string name="title_oauth_support">OAuth is not supported</string>
<string name="title_review">Review</string>
<string name="title_hint_alias">Long press for options, like copy to create alias identities</string>