TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-17 21:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change 'SD card' to 'storage' & cosmetic corrections

Browse Source 
Fixes #3920
This commit is contained in:
RiseT 2015-11-05 23:42:04 +01:00 committed by Moxie Marlinspike
parent c867316e6a
commit 7f0b0803bc
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/import_fragment.xml
View File

@ -80,7 +80,7 @@
<TextView android:layout_width="match_parent" <TextView android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Registration.Description" style="@style/Registration.Description"
android:text="@string/import_fragment__import_encrypted_backup"/> android:text="@string/import_fragment__restore_encrypted_backup"/>
<TextView android:layout_width="match_parent" <TextView android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

30
res/values/strings.xml
View File

@ -140,7 +140,7 @@
<item quantity="other">This will permanently delete all %1$d selected messages.</item> <item quantity="other">This will permanently delete all %1$d selected messages.</item>
</plurals> </plurals>
<string name="ConversationFragment_save_to_sd_card">Save to storage?</string> <string name="ConversationFragment_save_to_sd_card">Save to storage?</string>
<string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Saving this media to storage will allow any other apps on your phone to access it.\n\nContinue?</string> <string name="ConversationFragment_saving_this_media_to_storage_warning">Saving this media to storage will allow any other apps on your device to access it.\n\nContinue?</string>
<string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Error while saving attachment to storage!</string> <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Error while saving attachment to storage!</string>
<string name="ConversationFragment_success_exclamation">Success!</string> <string name="ConversationFragment_success_exclamation">Success!</string>
<string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string> <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string>
@ -205,15 +205,13 @@
<string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure and RedPhone are now one app: Signal. Tap to explore.</string> <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure and RedPhone are now one app: Signal. Tap to explore.</string>
<!-- ExportFragment --> <!-- ExportFragment -->
<string name="ExportFragment_export">Export</string> <string name="ExportFragment_export">Export</string>
<string name="ExportFragment_export_plaintext_to_sd_card">Export plaintext to SD card?</string> <string name="ExportFragment_export_plaintext_to_storage">Export plaintext to storage?</string>
<string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Warning, this will <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Warning, this will export the plaintext contents of your Signal messages to storage.</string>
export the plaintext contents of your Signal messages to the SD card.
</string>
<string name="ExportFragment_cancel">Cancel</string> <string name="ExportFragment_cancel">Cancel</string>
<string name="ExportFragment_exporting">Exporting</string> <string name="ExportFragment_exporting">Exporting</string>
<string name="ExportFragment_exporting_plaintext_to_sd_card">Exporting plaintext to SD card...</string> <string name="ExportFragment_exporting_plaintext_to_storage">Exporting plaintext to storage...</string>
<string name="ExportFragment_error_unable_to_write_to_sd_card">Error, unable to write to SD card!</string> <string name="ExportFragment_error_unable_to_write_to_storage">Error, unable to write to storage.</string>
<string name="ExportFragment_error_while_writing_to_sd_card">Error while writing to SD card.</string> <string name="ExportFragment_error_while_writing_to_storage">Error while writing to storage.</string>
<string name="ExportFragment_success">Success!</string> <string name="ExportFragment_success">Success!</string>
<!-- GcmRefreshJob --> <!-- GcmRefreshJob -->
@ -656,19 +654,13 @@
<string name="database_upgrade_activity__updating_database">Updating database...</string> <string name="database_upgrade_activity__updating_database">Updating database...</string>
<string name="export_fragment__export_plaintext_backup">Export plaintext backup</string> <string name="export_fragment__export_plaintext_backup">Export plaintext backup</string>
<string name="export_fragment__export_a_plaintext_backup_compatible_with"> <string name="export_fragment__export_a_plaintext_backup_compatible_with">Export a plaintext backup compatible with \'SMS Backup &amp; Restore\' to storage</string>
Export a plaintext backup compatible with \'SMSBackup And Restore\' to the SD card.</string>
<string name="import_fragment__import_system_sms_database">Import system SMS database</string> <string name="import_fragment__import_system_sms_database">Import system SMS database</string>
<string name="import_fragment__import_the_database_from_the_default_system">Import the database <string name="import_fragment__import_the_database_from_the_default_system">Import the database from the default system messenger app</string>
from the default system messenger app. <string name="import_fragment__restore_encrypted_backup">Restore encrypted backup</string>
</string> <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Restore a previously exported encrypted Signal backup</string>
<string name="import_fragment__import_encrypted_backup">Import encrypted backup</string>
<string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">
Restore a previously exported encrypted Signal backup.
</string>
<string name="import_fragment__import_plaintext_backup">Import plaintext backup</string> <string name="import_fragment__import_plaintext_backup">Import plaintext backup</string>
<string name="import_fragment__import_a_plaintext_backup_file"> <string name="import_fragment__import_a_plaintext_backup_file">Import a plaintext backup file. Compatible with \'SMS Backup &amp; Restore.\'</string>
Import a plaintext backup file. Compatible with \'SMSBackup And Restore.\'</string>
<!-- load_more_header --> <!-- load_more_header -->
<string name="load_more_header__see_full_conversation">See full conversation</string> <string name="load_more_header__see_full_conversation">See full conversation</string>

12
src/org/thoughtcrime/securesms/ExportFragment.java
View File

@ -75,7 +75,7 @@ public class ExportFragment extends Fragment {
private void handleExportPlaintextBackup() { private void handleExportPlaintextBackup() {
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity()); AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
builder.setIconAttribute(R.attr.dialog_alert_icon); builder.setIconAttribute(R.attr.dialog_alert_icon);
builder.setTitle(getActivity().getString(R.string.ExportFragment_export_plaintext_to_sd_card)); builder.setTitle(getActivity().getString(R.string.ExportFragment_export_plaintext_to_storage));
builder.setMessage(getActivity().getString(R.string.ExportFragment_warning_this_will_export_the_plaintext_contents)); builder.setMessage(getActivity().getString(R.string.ExportFragment_warning_this_will_export_the_plaintext_contents));
builder.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() { builder.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() {
@Override @Override
@ -94,7 +94,7 @@ public class ExportFragment extends Fragment {
protected void onPreExecute() { protected void onPreExecute() {
dialog = ProgressDialog.show(getActivity(), dialog = ProgressDialog.show(getActivity(),
getActivity().getString(R.string.ExportFragment_exporting), getActivity().getString(R.string.ExportFragment_exporting),
getActivity().getString(R.string.ExportFragment_exporting_plaintext_to_sd_card), getActivity().getString(R.string.ExportFragment_exporting_plaintext_to_storage),
true, false); true, false);
} }
@ -125,12 +125,12 @@ public class ExportFragment extends Fragment {
switch (result) { switch (result) {
case NO_SD_CARD: case NO_SD_CARD:
Toast.makeText(context, Toast.makeText(context,
context.getString(R.string.ExportFragment_error_unable_to_write_to_sd_card), context.getString(R.string.ExportFragment_error_unable_to_write_to_storage),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
break; break;
case IO_ERROR: case IO_ERROR:
Toast.makeText(context, Toast.makeText(context,
context.getString(R.string.ExportFragment_error_while_writing_to_sd_card), context.getString(R.string.ExportFragment_error_while_writing_to_storage),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
break; break;
case SUCCESS: case SUCCESS:
@ -164,12 +164,12 @@ public class ExportFragment extends Fragment {
// switch (result) { // switch (result) {
// case NO_SD_CARD: // case NO_SD_CARD:
// Toast.makeText(context, // Toast.makeText(context,
// context.getString(R.string.ExportFragment_error_unable_to_write_to_sd_card), // context.getString(R.string.ExportFragment_error_unable_to_write_to_storage),
// Toast.LENGTH_LONG).show(); // Toast.LENGTH_LONG).show();
// break; // break;
// case IO_ERROR: // case IO_ERROR:
// Toast.makeText(context, // Toast.makeText(context,
// context.getString(R.string.ExportFragment_error_while_writing_to_sd_card), // context.getString(R.string.ExportFragment_error_while_writing_to_storage),
// Toast.LENGTH_LONG).show(); // Toast.LENGTH_LONG).show();
// break; // break;
// case SUCCESS: // case SUCCESS:

2
src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
View File

@ -153,7 +153,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
builder.setTitle(R.string.ConversationFragment_save_to_sd_card); builder.setTitle(R.string.ConversationFragment_save_to_sd_card);
builder.setIconAttribute(R.attr.dialog_alert_icon); builder.setIconAttribute(R.attr.dialog_alert_icon);
builder.setCancelable(true); builder.setCancelable(true);
builder.setMessage(R.string.ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning); builder.setMessage(R.string.ConversationFragment_saving_this_media_to_storage_warning);
builder.setPositiveButton(R.string.yes, onAcceptListener); builder.setPositiveButton(R.string.yes, onAcceptListener);
builder.setNegativeButton(R.string.no, null); builder.setNegativeButton(R.string.no, null);
builder.show(); builder.show();