mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added support reference

This commit is contained in:
M66B 2022-05-15 10:19:48 +02:00
parent 143516cba9
commit 75f8f5c91a
23 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -568,7 +568,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
private void onMenuIssue() {
startActivity(Helper.getIntentIssue(this));
startActivity(Helper.getIntentIssue(this, "Setup:issue"));
}
private void onMenuPrivacy() {

2
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -1931,7 +1931,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
private void onMenuIssue() {
startActivity(Helper.getIntentIssue(this));
startActivity(Helper.getIntentIssue(this, "View:issue"));
}
private void onMenuPrivacy() {

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -4473,7 +4473,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onHelp();
return true;
} else if (itemId == R.string.menu_faq) {
Helper.view(context, Helper.getSupportUri(context), false);
Helper.view(context, Helper.getSupportUri(context, "Message:error"), false);
return true;
} else if (itemId == R.string.menu_setup) {
onSettings();

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

@ -504,7 +504,7 @@ public class FragmentAccount extends FragmentBase {
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Account:support"), false);
}
});

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

@ -195,7 +195,7 @@ public class FragmentGmail extends FragmentBase {
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Gmail:support"), false);
}
});

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

@ -515,7 +515,7 @@ public class FragmentIdentity extends FragmentBase {
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Identity:support"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -10025,7 +10025,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
public void onClick(View v) {
dismiss();
prefs.edit().putLong("review_later", new Date().getTime()).apply();
startActivity(Helper.getIntentIssue(v.getContext()));
startActivity(Helper.getIntentIssue(v.getContext(), "Review:issue"));
}
});

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

@ -199,7 +199,7 @@ public class FragmentOAuth extends FragmentBase {
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "OAuth:support"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
View File

@ -170,7 +170,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:behavior"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
View File

@ -139,7 +139,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:connection"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@ -355,7 +355,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:display"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
View File

@ -186,7 +186,7 @@ public class FragmentOptionsEncryption extends FragmentBase
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:encryption"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
View File

@ -380,7 +380,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:misc"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
View File

@ -205,7 +205,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:notifications"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
View File

@ -178,7 +178,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:privacy"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View File

@ -210,7 +210,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:send"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
View File

@ -195,7 +195,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Options:sync"), false);
}
});

2
app/src/main/java/eu/faircode/email/FragmentPro.java
View File

@ -165,7 +165,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Pro:support"), false);
}
});

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

@ -236,7 +236,7 @@ public class FragmentQuickSetup extends FragmentBase {
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false);
Helper.view(v.getContext(), Helper.getSupportUri(v.getContext(), "Quick:support"), false);
}
});

6
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -230,7 +230,7 @@ public class FragmentSetup extends FragmentBase {
@Override
public void onClick(View v) {
Intent view = new Intent(Intent.ACTION_VIEW)
.setData(Helper.getSupportUri(v.getContext()));
.setData(Helper.getSupportUri(v.getContext(), "Welcome:support"));
v.getContext().startActivity(view);
}
});
@ -358,7 +358,7 @@ public class FragmentSetup extends FragmentBase {
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_POP3));
return true;
} else if (itemId == R.string.menu_faq) {
Helper.view(getContext(), Helper.getSupportUri(getContext()), false);
Helper.view(getContext(), Helper.getSupportUri(getContext(), "Providers:support"), false);
return true;
}
@ -667,7 +667,7 @@ public class FragmentSetup extends FragmentBase {
@Override
public void onClick(View v) {
Intent view = new Intent(Intent.ACTION_VIEW)
.setData(Helper.getSupportUri(v.getContext()));
.setData(Helper.getSupportUri(v.getContext(), "Extra:support"));
v.getContext().startActivity(view);
}
});

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

@ -910,7 +910,7 @@ public class Helper {
.build();
}
static Uri getSupportUri(Context context) {
static Uri getSupportUri(Context context, String reference) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String language = prefs.getString("language", null);
Locale slocale = Resources.getSystem().getConfiguration().locale;
@ -922,10 +922,11 @@ public class Helper {
.appendQueryParameter("locale", slocale.toString())
.appendQueryParameter("language", language == null ? "" : language)
.appendQueryParameter("installed", Helper.hasValidFingerprint(context) ? "" : "Other")
.appendQueryParameter("reference", reference)
.build();
}
static Intent getIntentIssue(Context context) {
static Intent getIntentIssue(Context context, String reference) {
if (ActivityBilling.isPro(context)) {
String version = BuildConfig.VERSION_NAME + BuildConfig.REVISION + "/" +
(Helper.hasValidFingerprint(context) ? "1" : "3") +
@ -968,7 +969,7 @@ public class Helper {
return intent;
} else {
if (Helper.hasValidFingerprint(context))
return new Intent(Intent.ACTION_VIEW, getSupportUri(context));
return new Intent(Intent.ACTION_VIEW, getSupportUri(context, reference));
else
return new Intent(Intent.ACTION_VIEW, Uri.parse(XDA_URI));
}

2
app/src/main/java/eu/faircode/email/Log.java
View File

@ -1757,7 +1757,7 @@ public class Log {
.setPositiveButton(R.string.menu_faq, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
Uri uri = Helper.getSupportUri(context);
Uri uri = Helper.getSupportUri(context, "Unexpected:error");
if (!TextUtils.isEmpty(message))
uri = uri
.buildUpon()

2
app/src/play/java/eu/faircode/email/ActivityBilling.java
View File

@ -292,7 +292,7 @@ public class ActivityBilling extends ActivityBase implements
private void onPurchaseError(Intent intent) {
String message = intent.getStringExtra("message");
boolean play = Helper.hasPlayStore(this);
Uri uri = Helper.getSupportUri(this);
Uri uri = Helper.getSupportUri(this, "Purchase:error");
if (!TextUtils.isEmpty(message))
uri = uri
.buildUpon()