Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 04:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new backups category for help fragment.

Browse Source
This commit is contained in:
Alex Hart
2024-11-06 09:49:53 -04:00
committed by Greyson Parrelli
parent f14f7f7478
commit c878da30ae
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
View File

@@ -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.status.BackupStatusRow
import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
import org.thoughtcrime.securesms.billing.launchManageBackupsSubscription 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.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher
import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.ComposeFragment
import org.thoughtcrime.securesms.fonts.SignalSymbols import org.thoughtcrime.securesms.fonts.SignalSymbols
import org.thoughtcrime.securesms.fonts.SignalSymbols.SignalSymbol import org.thoughtcrime.securesms.fonts.SignalSymbols.SignalSymbol
import org.thoughtcrime.securesms.help.HelpFragment
import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState
import org.thoughtcrime.securesms.payments.FiatMoneyUtil import org.thoughtcrime.securesms.payments.FiatMoneyUtil
import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.DateUtils
@@ -228,7 +230,8 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
} }
override fun onContactSupport() { override fun onContactSupport() {
// TODO - [backups] Need to contact support. requireActivity().finish()
requireActivity().startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.REMOTE_BACKUPS_INDEX))
} }
} }

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

@@ -40,7 +40,7 @@ public class HelpFragment extends LoggingFragment {
public static final String START_CATEGORY_INDEX = "start_category_index"; public static final String START_CATEGORY_INDEX = "start_category_index";
public static final int PAYMENT_INDEX = 6; public static final int PAYMENT_INDEX = 6;
public static final int DONATION_INDEX = 7; 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 EditText problem;
private CheckBox includeDebugLogs; private CheckBox includeDebugLogs;
@@ -94,7 +94,7 @@ public class HelpFragment extends LoggingFragment {
emoji.add(view.findViewById(feeling.getViewId())); 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); categoryAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
categorySpinner.setAdapter(categoryAdapter); categorySpinner.setAdapter(categoryAdapter);
@@ -210,7 +210,7 @@ public class HelpFragment extends LoggingFragment {
suffix.append(getString(feeling.getStringId())); 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()] String category = (helpViewModel.getCategoryIndex() >= 0 && helpViewModel.getCategoryIndex() < englishCategories.length) ? englishCategories[helpViewModel.getCategoryIndex()]
: categoryAdapter.getItem(helpViewModel.getCategoryIndex()).toString(); : categoryAdapter.getItem(helpViewModel.getCategoryIndex()).toString();

3
app/src/main/res/values/strings.xml
View File

@@ -3461,7 +3461,7 @@
<string name="HelpFragment__debug_log" translatable="false">Debug Log:</string> <string name="HelpFragment__debug_log" translatable="false">Debug Log:</string>
<string name="HelpFragment__could_not_upload_logs">Could not upload logs</string> <string name="HelpFragment__could_not_upload_logs">Could not upload logs</string>
<string name="HelpFragment__please_be_as_descriptive_as_possible">Please be as descriptive as possible to help us understand the issue.</string> <string name="HelpFragment__please_be_as_descriptive_as_possible">Please be as descriptive as possible to help us understand the issue.</string>
<string-array name="HelpFragment__categories_5"> <string-array name="HelpFragment__categories_6">
<item>Please select an option</item> <item>Please select an option</item>
<item>Something\'s Not Working</item> <item>Something\'s Not Working</item>
<item>Feature Request</item> <item>Feature Request</item>
@@ -3470,6 +3470,7 @@
<item>Other</item> <item>Other</item>
<item>Payments (MobileCoin)</item> <item>Payments (MobileCoin)</item>
<item>Donations &amp; Badges</item> <item>Donations &amp; Badges</item>
<item>Signal Android Backup</item>
</string-array> </string-array>
<!-- Subject of email when submitting debug logs to help debug slow notifications --> <!-- Subject of email when submitting debug logs to help debug slow notifications -->
<string name="DebugLogsPromptDialogFragment__signal_android_support_request">Signal Android Debug Log Submission</string> <string name="DebugLogsPromptDialogFragment__signal_android_support_request">Signal Android Debug Log Submission</string>