Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a category dropdown in the help fragment.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-03-12 20:27:32 -05:00
parent e7c5eb93dd
commit 07201203b2
5 changed files with 121 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
View File

@@ -27,21 +27,35 @@ public final class SupportEmailUtil {
* Generates a support email body with system info near the top.
*/
public static @NonNull String generateSupportEmailBody(@NonNull Context context,
@StringRes int subject,
@StringRes int filter,
@Nullable String prefix,
@Nullable String suffix)
{
prefix = Util.firstNonNull(prefix, "");
suffix = Util.firstNonNull(suffix, "");
return String.format("%s\n%s\n%s", prefix, buildSystemInfo(context, subject), suffix);
return generateSupportEmailBody(context, filter, null, prefix, suffix);
}
private static @NonNull String buildSystemInfo(@NonNull Context context, @StringRes int subject) {
/**
* Generates a support email body with system info near the top.
*/
public static @NonNull String generateSupportEmailBody(@NonNull Context context,
@StringRes int filter,
@Nullable String filterSuffix,
@Nullable String prefix,
@Nullable String suffix)
{
filterSuffix = Util.emptyIfNull(filterSuffix);
prefix = Util.emptyIfNull(prefix);
suffix = Util.emptyIfNull(suffix);
return String.format("%s\n%s\n%s", prefix, buildSystemInfo(context, filter, filterSuffix), suffix);
}
private static @NonNull String buildSystemInfo(@NonNull Context context, @StringRes int filter, @NonNull String filterSuffix) {
Resources englishResources = ResourceUtil.getEnglishResources(context);
return "--- " + context.getString(R.string.HelpFragment__support_info) + " ---" +
"\n" +
context.getString(R.string.SupportEmailUtil_filter) + " " + englishResources.getString(subject) +
context.getString(R.string.SupportEmailUtil_filter) + " " + englishResources.getString(filter) + filterSuffix +
"\n" +
context.getString(R.string.SupportEmailUtil_device_info) + " " + getDeviceInfo() +
"\n" +