From 3bcac5b0ed61ae21410436c0cb15abc3fc75b703 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 22 Nov 2021 09:30:47 +0100 Subject: [PATCH] Added button to disable Gmail --- .../faircode/email/FragmentDialogAccount.java | 19 +++++++++++++++++++ .../main/res/layout/dialog_review_account.xml | 13 +++++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 33 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogAccount.java b/app/src/main/java/eu/faircode/email/FragmentDialogAccount.java index 8f2b8f8d23..2cdac72b56 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogAccount.java @@ -24,7 +24,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; +import android.net.Uri; import android.os.Bundle; +import android.provider.Settings; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -40,6 +42,7 @@ import java.util.ArrayList; import java.util.List; import static android.app.Activity.RESULT_OK; +import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_GMAIL; public class FragmentDialogAccount extends FragmentDialogBase { @NonNull @@ -59,6 +62,7 @@ public class FragmentDialogAccount extends FragmentDialogBase { final TextView tvLeft = dview.findViewById(R.id.tvLeft); final TextView tvRight = dview.findViewById(R.id.tvRight); final Button btnAccount = dview.findViewById(R.id.btnAccount); + final Button btnGmail = dview.findViewById(R.id.btnGmail); final Drawable check = context.getDrawable(R.drawable.twotone_check_24); final Drawable close = context.getDrawable(R.drawable.twotone_close_24); @@ -78,6 +82,7 @@ public class FragmentDialogAccount extends FragmentDialogBase { tvRight.setText(null); tvSentWarning.setVisibility(View.GONE); + btnGmail.setVisibility(View.GONE); Bundle args = getArguments(); final long account = args.getLong("account"); @@ -94,12 +99,26 @@ public class FragmentDialogAccount extends FragmentDialogBase { } }); + Intent gmail = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + gmail.setData(Uri.parse("package:com.google.android.gm")); + boolean hasGmail = (gmail.resolveActivity(context.getPackageManager()) != null); + + btnGmail.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + v.getContext().startActivity(gmail); + } + }); + DB db = DB.getInstance(context); db.account().liveAccount(account).observe(this, new Observer() { @Override public void onChanged(EntityAccount account) { tvName.setText(account.name); + btnGmail.setVisibility( + hasGmail && account.auth_type == AUTH_TYPE_GMAIL + ? View.VISIBLE : View.GONE); } }); diff --git a/app/src/main/res/layout/dialog_review_account.xml b/app/src/main/res/layout/dialog_review_account.xml index 50dcd9dd5a..b031cbe929 100644 --- a/app/src/main/res/layout/dialog_review_account.xml +++ b/app/src/main/res/layout/dialog_review_account.xml @@ -197,5 +197,18 @@ android:textAppearance="@style/TextAppearance.AppCompat.Small" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/btnAccount" /> + +