From 0f8e9589353bdfca5b7deca3f0552f1d645352be Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 4 Feb 2019 16:10:30 +0000 Subject: [PATCH] Small improvements --- app/src/main/java/eu/faircode/email/ActivityView.java | 4 ++-- app/src/main/java/eu/faircode/email/FragmentAccount.java | 2 +- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentFolder.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index fbe1abe2b3..5b99701ef8 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1217,7 +1217,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB for (EntityAttachment attachment : attachments) if (EntityAttachment.PGP_MESSAGE.equals(attachment.encryption)) { if (!attachment.available) - throw new IllegalArgumentException(getString(R.string.title_attachments_missing)); + throw new IllegalArgumentException(context.getString(R.string.title_attachments_missing)); File file = EntityAttachment.getFile(context, attachment.id); encrypted = new BufferedInputStream(new FileInputStream(file)); @@ -1246,7 +1246,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } if (encrypted == null) - throw new IllegalArgumentException(getString(R.string.title_not_encrypted)); + throw new IllegalArgumentException(context.getString(R.string.title_not_encrypted)); ByteArrayOutputStream decrypted = new ByteArrayOutputStream(); diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 083a3a7266..de10e18c0b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -635,7 +635,7 @@ public class FragmentAccount extends FragmentBase { } if (!inbox) - throw new IllegalArgumentException(getString(R.string.title_no_inbox)); + throw new IllegalArgumentException(context.getString(R.string.title_no_inbox)); if (!archive && altArchive != null) altArchive.type = EntityFolder.ARCHIVE; if (!drafts && altDrafts != null) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index cb3043d624..504d150710 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1543,7 +1543,7 @@ public class FragmentCompose extends FragmentBase { if (drafts == null) drafts = db.folder().getPrimaryDrafts(); if (drafts == null) - throw new IllegalArgumentException(getString(R.string.title_no_primary_drafts)); + throw new IllegalArgumentException(context.getString(R.string.title_no_primary_drafts)); String body = ""; diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index bfc9727c37..f55e1e13f9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -208,7 +208,7 @@ public class FragmentFolder extends FragmentBase { Log.i("Creating folder=" + name); if (TextUtils.isEmpty(name)) - throw new IllegalArgumentException(getString(R.string.title_folder_name_missing)); + throw new IllegalArgumentException(context.getString(R.string.title_folder_name_missing)); EntityFolder create = new EntityFolder(); create.account = aid; @@ -323,7 +323,7 @@ public class FragmentFolder extends FragmentBase { int count = db.operation().getOperationCount(id, null); if (count > 0) throw new IllegalArgumentException( - getResources().getQuantityString( + context.getResources().getQuantityString( R.plurals.title_notification_operations, count, count)); db.folder().setFolderTbd(id);