From e02aa3e000b1e71f8399a1f41257e616f85d083d Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 5 May 2021 08:38:56 +0200 Subject: [PATCH] Improved OAuth third party message --- .../java/eu/faircode/email/FragmentSetup.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index b18366423f..960f5b6934 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -45,7 +45,6 @@ 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; @@ -209,7 +208,17 @@ public class FragmentSetup extends FragmentBase { if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG) lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL)); else - ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show(); + new AlertDialog.Builder(getContext()) + .setTitle(item.getTitle()) + .setMessage(R.string.title_setup_gmail_support) + .setNeutralButton(R.string.title_info, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Helper.viewFAQ(getContext(), 6); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); return true; } else if (itemId == R.string.title_setup_other) { lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP)); @@ -225,7 +234,17 @@ public class FragmentSetup extends FragmentBase { if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG) lbm.sendBroadcast(item.getIntent()); else - ToastEx.makeText(getContext(), R.string.title_setup_oauth_permission, Toast.LENGTH_LONG).show(); + new AlertDialog.Builder(getContext()) + .setTitle(item.getTitle()) + .setMessage(R.string.title_setup_oauth_permission) + .setNeutralButton(R.string.title_info, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Helper.viewFAQ(getContext(), 147); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); return true; } }