Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include an English filter line in the support email body.

Browse Source
This commit is contained in:
Alan Evans
2021-01-19 17:06:23 -04:00
committed by GitHub
parent 9c47acb004
commit 848ead5e78
7 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
View File

@@ -172,7 +172,7 @@ public class HelpFragment extends LoggingFragment {
}
return SupportEmailUtil.generateSupportEmailBody(requireContext(),
getString(R.string.HelpFragment__signal_android_support_request),
R.string.HelpFragment__signal_android_support_request,
problem.getText().toString() + "\n\n",
suffix.toString());
}

2
app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
View File

@@ -198,7 +198,7 @@ public class PinRestoreEntryFragment extends LoggingFragment {
}))
.setNeutralButton(R.string.PinRestoreEntryFragment_contact_support, (dialog, which) -> {
String body = SupportEmailUtil.generateSupportEmailBody(requireContext(),
getString(R.string.PinRestoreEntryFragment_signal_registration_need_help_with_pin),
R.string.PinRestoreEntryFragment_signal_registration_need_help_with_pin,
null,
null);
CommunicationActions.openEmail(requireContext(),

2
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
View File

@@ -335,7 +335,7 @@ public final class EnterCodeFragment extends BaseRegistrationFragment
private void sendEmailToSupport() {
String body = SupportEmailUtil.generateSupportEmailBody(requireContext(),
getString(R.string.RegistrationActivity_code_support_subject),
R.string.RegistrationActivity_code_support_subject,
null,
null);
CommunicationActions.openEmail(requireContext(),

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

@@ -1,11 +1,14 @@
package org.thoughtcrime.securesms.util;
import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import org.signal.core.util.EnglishResourceUtil;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -24,7 +27,7 @@ public final class SupportEmailUtil {
* Generates a support email body with system info near the top.
*/
public static @NonNull String generateSupportEmailBody(@NonNull Context context,
@NonNull String subject,
@StringRes int subject,
@Nullable String prefix,
@Nullable String suffix)
{
@@ -33,10 +36,12 @@ public final class SupportEmailUtil {
return String.format("%s\n%s\n%s", prefix, buildSystemInfo(context, subject), suffix);
}
private static @NonNull String buildSystemInfo(@NonNull Context context, @NonNull String subject) {
private static @NonNull String buildSystemInfo(@NonNull Context context, @StringRes int subject) {
Resources englishResources = EnglishResourceUtil.getEnglishResources(context);
return "--- " + context.getString(R.string.HelpFragment__support_info) + " ---" +
"\n" +
context.getString(R.string.SupportEmailUtil_subject) + " " + subject +
context.getString(R.string.SupportEmailUtil_filter) + " " + englishResources.getString(subject) +
"\n" +
context.getString(R.string.SupportEmailUtil_device_info) + " " + getDeviceInfo() +
"\n" +