From 3710faac2337eb14d8437e9cb4fabe66aa3bc38c Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 6 Apr 2021 08:59:35 +0200 Subject: [PATCH] Improved support info --- .../main/java/eu/faircode/email/FragmentAccount.java | 4 ++-- .../main/java/eu/faircode/email/FragmentGmail.java | 5 ++--- .../main/java/eu/faircode/email/FragmentIdentity.java | 4 ++-- .../main/java/eu/faircode/email/FragmentOAuth.java | 4 ++-- .../java/eu/faircode/email/FragmentQuickSetup.java | 4 ++-- app/src/main/java/eu/faircode/email/Helper.java | 11 +++++++++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index e581bd6792..059d1319d5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -462,8 +462,8 @@ public class FragmentAccount extends FragmentBase { btnSupport.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - Helper.view(view.getContext(), Uri.parse(Helper.SUPPORT_URI), false); + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java index 26bde01c0b..30e1c3991e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentGmail.java +++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java @@ -32,7 +32,6 @@ import android.database.Cursor; import android.graphics.Paint; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; import android.text.TextUtils; @@ -158,8 +157,8 @@ public class FragmentGmail extends FragmentBase { btnSupport.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - Helper.view(view.getContext(), Uri.parse(Helper.SUPPORT_URI), false); + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 86844a2ea9..360a8c71d7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -481,8 +481,8 @@ public class FragmentIdentity extends FragmentBase { btnSupport.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - Helper.view(view.getContext(), Uri.parse(Helper.SUPPORT_URI), false); + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index 711cc0a29a..5a92e985cc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -154,8 +154,8 @@ public class FragmentOAuth extends FragmentBase { btnSupport.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - Helper.view(view.getContext(), Uri.parse(Helper.SUPPORT_URI), false); + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 9a6ca2cd94..54b5258222 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -177,8 +177,8 @@ public class FragmentQuickSetup extends FragmentBase { btnSupport.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - Helper.view(view.getContext(), Uri.parse(Helper.SUPPORT_URI), false); + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); } }); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 9bafd555cb..1016ab557f 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -157,7 +157,7 @@ public class Helper { static final String FAQ_URI = "https://email.faircode.eu/faq/"; static final String XDA_URI = "https://forum.xda-developers.com/showthread.php?t=3824168"; - static final String SUPPORT_URI = "https://contact.faircode.eu/?product=fairemailsupport"; + static final String SUPPORT_URI = "https://contact.faircode.eu/?product=fairemailsupport&version=" + BuildConfig.VERSION_NAME; static final String TEST_URI = "https://play.google.com/apps/testing/" + BuildConfig.APPLICATION_ID; static final String GRAVATAR_PRIVACY_URI = "https://meta.stackexchange.com/questions/44717/is-gravatar-a-privacy-risk"; static final String LICENSE_URI = "https://www.gnu.org/licenses/gpl-3.0.html"; @@ -720,6 +720,13 @@ public class Helper { return prefs.getString("openpgp_provider", "org.sufficientlysecure.keychain"); } + static Uri getSupportUri(Context context) { + return Uri.parse(SUPPORT_URI) + .buildUpon() + .appendQueryParameter("installed", Helper.hasValidFingerprint(context) ? "" : "Other") + .build(); + } + static Intent getIntentIssue(Context context) { if (ActivityBilling.isPro(context)) { String version = BuildConfig.VERSION_NAME + "/" + @@ -739,7 +746,7 @@ public class Helper { return intent; } else { if (Helper.hasValidFingerprint(context)) - return new Intent(Intent.ACTION_VIEW, Uri.parse(SUPPORT_URI)); + return new Intent(Intent.ACTION_VIEW, getSupportUri(context)); else return new Intent(Intent.ACTION_VIEW, Uri.parse(XDA_URI)); }