TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-09 07:36:50 +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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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:

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.setIconAttribute(R.attr.dialog_alert_icon);
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.setNegativeButton(R.string.no, null);
builder.show();