From 9c59d6a69beea6ca6d189555ea11e042d21195e5 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 2 Apr 2021 12:42:10 -0400 Subject: [PATCH] Use english help categories for email filter. --- .../java/org/thoughtcrime/securesms/help/HelpFragment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java index 7fca33f3c..6efae8a67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java @@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModelProviders; import com.annimon.stream.Stream; import com.dd.CircularProgressButton; +import org.signal.core.util.ResourceUtil; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.R; @@ -193,7 +194,9 @@ public class HelpFragment extends LoggingFragment { suffix.append(getString(feeling.getStringId())); } - String category = categoryAdapter.getItem(helpViewModel.getCategoryIndex()).toString(); + String[] englishCategories = ResourceUtil.getEnglishResources(getContext()).getStringArray(R.array.HelpFragment__categories); + String category = (helpViewModel.getCategoryIndex() >= 0 && helpViewModel.getCategoryIndex() < englishCategories.length) ? englishCategories[helpViewModel.getCategoryIndex()] + : categoryAdapter.getItem(helpViewModel.getCategoryIndex()).toString(); return SupportEmailUtil.generateSupportEmailBody(requireContext(), R.string.HelpFragment__signal_android_support_request,