From 7f0b0803bc9f565e8c4b6fa67874a9e3db4421f6 Mon Sep 17 00:00:00 2001 From: RiseT Date: Thu, 5 Nov 2015 23:42:04 +0100 Subject: [PATCH] Change 'SD card' to 'storage' & cosmetic corrections Fixes #3920 --- res/layout/import_fragment.xml | 2 +- res/values/strings.xml | 30 +++++++------------ .../securesms/ExportFragment.java | 12 ++++---- .../securesms/util/SaveAttachmentTask.java | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/res/layout/import_fragment.xml b/res/layout/import_fragment.xml index 0867b3b6a0..50135a6fdb 100644 --- a/res/layout/import_fragment.xml +++ b/res/layout/import_fragment.xml @@ -80,7 +80,7 @@ + android:text="@string/import_fragment__restore_encrypted_backup"/> This will permanently delete all %1$d selected messages. Save to storage? - Saving this media to storage will allow any other apps on your phone to access it.\n\nContinue? + Saving this media to storage will allow any other apps on your device to access it.\n\nContinue? Error while saving attachment to storage! Success! Unable to write to storage! @@ -205,15 +205,13 @@ TextSecure and RedPhone are now one app: Signal. Tap to explore. Export - Export plaintext to SD card? - Warning, this will - export the plaintext contents of your Signal messages to the SD card. - + Export plaintext to storage? + Warning, this will export the plaintext contents of your Signal messages to storage. Cancel Exporting - Exporting plaintext to SD card... - Error, unable to write to SD card! - Error while writing to SD card. + Exporting plaintext to storage... + Error, unable to write to storage. + Error while writing to storage. Success! @@ -656,19 +654,13 @@ Updating database... Export plaintext backup - - Export a plaintext backup compatible with \'SMSBackup And Restore\' to the SD card. + Export a plaintext backup compatible with \'SMS Backup & Restore\' to storage Import system SMS database - Import the database - from the default system messenger app. - - Import encrypted backup - - Restore a previously exported encrypted Signal backup. - + Import the database from the default system messenger app + Restore encrypted backup + Restore a previously exported encrypted Signal backup Import plaintext backup - - Import a plaintext backup file. Compatible with \'SMSBackup And Restore.\' + Import a plaintext backup file. Compatible with \'SMS Backup & Restore.\' See full conversation diff --git a/src/org/thoughtcrime/securesms/ExportFragment.java b/src/org/thoughtcrime/securesms/ExportFragment.java index 658f4ff474..431deb5a37 100644 --- a/src/org/thoughtcrime/securesms/ExportFragment.java +++ b/src/org/thoughtcrime/securesms/ExportFragment.java @@ -75,7 +75,7 @@ public class ExportFragment extends Fragment { private void handleExportPlaintextBackup() { AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity()); 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.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() { @Override @@ -94,7 +94,7 @@ public class ExportFragment extends Fragment { protected void onPreExecute() { dialog = ProgressDialog.show(getActivity(), 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); } @@ -125,12 +125,12 @@ public class ExportFragment extends Fragment { switch (result) { case NO_SD_CARD: 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(); break; case IO_ERROR: 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(); break; case SUCCESS: @@ -164,12 +164,12 @@ public class ExportFragment extends Fragment { // switch (result) { // case NO_SD_CARD: // 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(); // break; // case IO_ERROR: // 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(); // break; // case SUCCESS: diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index 3ff6980883..eae15fcf83 100644 --- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -153,7 +153,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask