diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index fbf61b4e8c..fe055fbf4e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -42,6 +42,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -161,8 +162,7 @@ public class FragmentSetup extends FragmentBase {
public void onClick(View v) {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), btnQuick);
- popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, 1, R.string.title_setup_gmail)
- .setEnabled(Helper.hasValidFingerprint(getContext()));
+ 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_other, 2, R.string.title_setup_other);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@@ -171,7 +171,10 @@ public class FragmentSetup extends FragmentBase {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
switch (item.getItemId()) {
case R.string.title_setup_gmail:
- lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
+ if (Helper.hasValidFingerprint(getContext()))
+ lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
+ else
+ ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show();
return true;
case R.string.title_setup_other:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ee644f9d5..9aea696e73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,6 +137,7 @@
Wizard
Gmail
Other provider
+ Authorizing Google accounts will work in official versions only because Android checks the app signature
Please grant permissions to select an account and read your name
Select account
Setup instructions
@@ -318,7 +319,7 @@
Synchronizing periodically will compare local and remote messages each and every time, which is an expensive operation possibly resulting in extra battery usage, especially when there are a lot of messages to synchronize. Always synchronizing will avoid this by continuous monitoring for changes only.
Tap on a time to set a time
Check sender email addresses on synchronizing messages
- Some providers don\'t support this properly, which, for example, may result in all messages being synchronized
+ Some providers don\'t support this properly, which may cause synchronizing none or all messages
This will transfer extra data and consume extra battery power, especially if a lot of messages are stored on the device
Disabling this will reduce data and battery usage somewhat, but will disable updating the list of folders too
This will slow down synchronizing messages