diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt index d5bba33094..45c90479ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -87,10 +87,12 @@ import org.thoughtcrime.securesms.backup.v2.ui.status.BackupStatusData import org.thoughtcrime.securesms.backup.v2.ui.status.BackupStatusRow import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType import org.thoughtcrime.securesms.billing.launchManageBackupsSubscription +import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.fonts.SignalSymbols import org.thoughtcrime.securesms.fonts.SignalSymbols.SignalSymbol +import org.thoughtcrime.securesms.help.HelpFragment import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState import org.thoughtcrime.securesms.payments.FiatMoneyUtil import org.thoughtcrime.securesms.util.DateUtils @@ -228,7 +230,8 @@ class RemoteBackupsSettingsFragment : ComposeFragment() { } override fun onContactSupport() { - // TODO - [backups] Need to contact support. + requireActivity().finish() + requireActivity().startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.REMOTE_BACKUPS_INDEX)) } } 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 f979dd9540..30c0bc413d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java @@ -40,7 +40,7 @@ public class HelpFragment extends LoggingFragment { public static final String START_CATEGORY_INDEX = "start_category_index"; public static final int PAYMENT_INDEX = 6; public static final int DONATION_INDEX = 7; - public static final int SMS_EXPORT_INDEX = 8; + public static final int REMOTE_BACKUPS_INDEX = 8; private EditText problem; private CheckBox includeDebugLogs; @@ -94,7 +94,7 @@ public class HelpFragment extends LoggingFragment { emoji.add(view.findViewById(feeling.getViewId())); } - categoryAdapter = ArrayAdapter.createFromResource(requireContext(), R.array.HelpFragment__categories_5, android.R.layout.simple_spinner_item); + categoryAdapter = ArrayAdapter.createFromResource(requireContext(), R.array.HelpFragment__categories_6, android.R.layout.simple_spinner_item); categoryAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); categorySpinner.setAdapter(categoryAdapter); @@ -210,7 +210,7 @@ public class HelpFragment extends LoggingFragment { suffix.append(getString(feeling.getStringId())); } - String[] englishCategories = ResourceUtil.getEnglishResources(requireContext()).getStringArray(R.array.HelpFragment__categories_5); + String[] englishCategories = ResourceUtil.getEnglishResources(requireContext()).getStringArray(R.array.HelpFragment__categories_6); String category = (helpViewModel.getCategoryIndex() >= 0 && helpViewModel.getCategoryIndex() < englishCategories.length) ? englishCategories[helpViewModel.getCategoryIndex()] : categoryAdapter.getItem(helpViewModel.getCategoryIndex()).toString(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca1d4b03fd..a89900b80f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3461,7 +3461,7 @@ Debug Log: Could not upload logs Please be as descriptive as possible to help us understand the issue. - + Please select an option Something\'s Not Working Feature Request @@ -3470,6 +3470,7 @@ Other Payments (MobileCoin) Donations & Badges + Signal Android Backup Signal Android Debug Log Submission