Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 09:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved support info

Browse Source
This commit is contained in:
M66B
2021-04-06 08:59:35 +02:00
parent 01f8e12c81
commit 3710faac23
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
});

5
app/src/main/java/eu/faircode/email/FragmentGmail.java
View File

@@ -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);
}
});

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

@@ -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);
}
});

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

@@ -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);
}
});

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

@@ -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);
}
});

11
app/src/main/java/eu/faircode/email/Helper.java
View File

@@ -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));
}