mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Include an English filter line in the support email body.

fork-5.53.8
Alan Evans 2021-01-19 17:06:23 -04:00 zatwierdzone przez GitHub
rodzic 9c47acb004
commit 848ead5e78
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
7 zmienionych plików z 42 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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" +

2
app/src/main/res/values/strings.xml
Wyświetl plik

@ -1641,7 +1641,7 @@
<!-- SupportEmailUtil -->
<string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string>
<string name="SupportEmailUtil_subject">Subject:</string>
<string name="SupportEmailUtil_filter">Filter:</string>
<string name="SupportEmailUtil_signal_android_support_request">Signal Android Support Request</string>
<string name="SupportEmailUtil_device_info">Device info:</string>
<string name="SupportEmailUtil_android_version">Android version:</string>

29
core-util/src/main/java/org/signal/core/util/EnglishResourceUtil.java 100644
Wyświetl plik

@ -0,0 +1,29 @@
package org.signal.core.util;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import java.util.Locale;
/**
* Gives access to English strings.
*/
public final class EnglishResourceUtil {
private EnglishResourceUtil() {
}
public static Resources getEnglishResources(@NonNull Context context) {
Configuration configurationLocal = context.getResources().getConfiguration();
Configuration configurationEn = new Configuration(configurationLocal);
configurationEn.setLocale(Locale.ENGLISH);
return context.createConfigurationContext(configurationEn)
.getResources();
}
}

6
core-util/src/main/java/org/signal/core/util/TranslationDetection.java
Wyświetl plik

@ -24,11 +24,7 @@ public final class TranslationDetection {
public TranslationDetection(@NonNull Context context) {
this.resourcesLocal = context.getResources();
this.configurationLocal = resourcesLocal.getConfiguration();
Configuration configurationEn = new Configuration(configurationLocal);
configurationEn.setLocale(Locale.ENGLISH);
this.resourcesEn = context.createConfigurationContext(configurationEn).getResources();
this.resourcesEn = EnglishResourceUtil.getEnglishResources(context);
}
/**