From 0c74aa4cfaa7b1f401b662664f7b2e679b76a82b Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 14 Mar 2019 07:51:22 +0000 Subject: [PATCH] Explicit exceptions --- app/src/main/java/eu/faircode/email/ActivityView.java | 5 +++-- app/src/main/java/eu/faircode/email/AdapterAttachment.java | 6 ++++-- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 0ae5871ebc..c5e2aaf773 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -64,6 +64,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; @@ -1424,7 +1425,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB DB db = DB.getInstance(context); EntityMessage message = db.message().getMessage(id); if (message == null) - return null; + throw new FileNotFoundException(); File file = message.getRawFile(context); Log.i("Raw file=" + file); @@ -1498,7 +1499,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB DB db = DB.getInstance(context); EntityAttachment attachment = db.attachment().getAttachment(id); if (attachment == null) - return null; + throw new FileNotFoundException(); File file = attachment.getFile(context); ParcelFileDescriptor pfd = null; diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java index 8483236316..d3af250496 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java +++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java @@ -41,6 +41,8 @@ import android.widget.TextView; import android.widget.Toast; import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -170,13 +172,13 @@ public class AdapterAttachment extends RecyclerView.Adapter() { @Override - protected Void onExecute(Context context, Bundle args) { + protected Void onExecute(Context context, Bundle args) throws IOException { long id = args.getLong("id"); DB db = DB.getInstance(context); EntityAttachment attachment = db.attachment().getAttachment(id); if (attachment == null) - return null; + throw new FileNotFoundException(); db.attachment().setDownloaded(id, null); attachment.getFile(context).delete(); db.attachment().deleteAttachment(id); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 08ec2f04bc..991678b43b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -561,7 +561,7 @@ public class FragmentCompose extends FragmentBase { DB db = DB.getInstance(context); EntityMessage draft = db.message().getMessage(id); if (draft == null) - return null; + throw new FileNotFoundException(); File file = draft.getFile(context); File refFile = draft.getRefFile(context);