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

Added remark about Gmail account import

This commit is contained in:
M66B 2021-07-24 20:52:06 +02:00
parent 49aebd4f44
commit 36cdb85141
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1330,6 +1330,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
TextView tvCaption = dview.findViewById(R.id.tvCaption);
etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2);
TextView tvImportGmail = dview.findViewById(R.id.tvImportGmail);
Group grpExport = dview.findViewById(R.id.grpExport);
Group grpImport = dview.findViewById(R.id.grpImport);
@ -1341,6 +1342,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
tvImportGmail.setVisibility(
export || Build.VERSION.SDK_INT < Build.VERSION_CODES.O
? View.GONE : View.VISIBLE);
grpExport.setVisibility(export ? View.VISIBLE : View.GONE);
grpImport.setVisibility(export ? View.GONE : View.VISIBLE);

2
app/src/main/res/layout/dialog_password.xml
View File

@ -116,6 +116,6 @@
android:id="@+id/grpImport"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvImportHint,tvImportGmail" />
app:constraint_referenced_ids="tvImportHint" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

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

@ -241,7 +241,10 @@
</string>
<string name="title_setup_export_do">The export file will contain all settings and data, but no messages and no images referenced in signatures</string>
<string name="title_setup_import_do">Imported accounts will be added without overwriting any existing ones</string>
<string name="title_setup_import_gmail">Gmail accounts set up with the quick setup wizard will only be imported if the corresponding account is present on the device</string>
<string name="title_setup_import_gmail">
Since Android 8.0 Oreo, Gmail accounts can no longer be imported, as each account must be selected to grant access to the account.
You can easily reconfigure Gmail accounts with the quick setup wizard.
</string>
<string name="title_setup_password">Password</string>
<string name="title_setup_password_chars">Password contains control or whitespace characters</string>
<string name="title_setup_password_repeat">Repeat password</string>