fix up some dodgy nulls

k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java

@@ -46,24 +46,26 @@ public class BinaryTempFileBody implements RawDataBody, SizeAware {
 
         try {
             File newFile = File.createTempFile("body", null, mTempDirectory);
-            OutputStream out = new FileOutputStream(newFile);
+            final OutputStream out = new FileOutputStream(newFile);
             try {
+                OutputStream wrappedOut = null;
                 if (MimeUtil.ENC_QUOTED_PRINTABLE.equals(encoding)) {
-                    out = new QuotedPrintableOutputStream(out, false);
+                    wrappedOut = new QuotedPrintableOutputStream(out, false);
                 } else if (MimeUtil.ENC_BASE64.equals(encoding)) {
-                    out = new Base64OutputStream(out);
+                    wrappedOut = new Base64OutputStream(out);
                 } else {
                     throw new RuntimeException("Target encoding not supported: " + encoding);
                 }
 
                 InputStream in = getInputStream();
                 try {
-                    IOUtils.copy(in, out);
+                    IOUtils.copy(in, wrappedOut);
                 } finally {
-                    in.close();
+                    IOUtils.closeQuietly(in);
+                    IOUtils.closeQuietly(wrappedOut);
                 }
             } finally {
-                out.close();
+                IOUtils.closeQuietly(out);
             }
 
             mFile = newFile;
@@ -100,7 +102,7 @@ public class BinaryTempFileBody implements RawDataBody, SizeAware {
         try {
             IOUtils.copy(in, out);
         } finally {
-            in.close();
+            IOUtils.closeQuietly(in);
         }
     }
 

k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java

@@ -46,7 +46,7 @@ public class BinaryTempFileMessageBody extends BinaryTempFileBody implements Com
                 IOUtils.copy(in, out);
             }
         } finally {
-            in.close();
+            IOUtils.closeQuietly(in);
         }
     }
 

k9mail/src/main/java/com/fsck/k9/Account.java

@@ -1404,7 +1404,7 @@ public class Account implements BaseAccount, StoreConfig {
         if (i < identities.size()) {
             return identities.get(i);
         }
-        return null;
+        throw new IllegalArgumentException("Identity with index " + i + " not found");
     }
 
     public boolean isAnIdentity(Address[] addrs) {

k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java

@@ -1024,15 +1024,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
     }
 
     private String getFolderNameById(Account account, long folderId) {
-        try {
-            Folder folder = getFolderById(account, folderId);
-            if (folder != null) {
-                return folder.getName();
-            }
-        } catch (Exception e) {
-            Log.e(K9.LOG_TAG, "getFolderNameById() failed.", e);
+        Folder folder = getFolderById(account, folderId);
+        if (folder != null) {
+            return folder.getName();
         }
-
         return null;
     }
 
@@ -1042,9 +1037,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
             LocalFolder localFolder = localStore.getFolderById(folderId);
             localFolder.open(Folder.OPEN_MODE_RO);
             return localFolder;
-        } catch (Exception e) {
-            Log.e(K9.LOG_TAG, "getFolderNameById() failed.", e);
-            return null;
+        } catch (MessagingException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -3162,10 +3156,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         try {
             return folder.getMessage(uid);
         } catch (MessagingException e) {
-            Log.e(K9.LOG_TAG, "Something went wrong while fetching a message", e);
+            throw new RuntimeException(e);
         }
-
-        return null;
     }
 
     private List<LocalMessage> getCheckedMessages() {

k9mail/src/test/java/com/fsck/k9/helper/HtmlConverterTest.java

@@ -4,7 +4,9 @@ package com.fsck.k9.helper;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -136,18 +138,23 @@ public class HtmlConverterTest {
         if (!WRITE_TO_FILE) {
             return;
         }
+
+        FileWriter fstream = null;
+
         try {
             System.err.println(content);
 
             File f = new File(OUTPUT_FILE);
             f.delete();
 
-            FileWriter fstream = new FileWriter(OUTPUT_FILE);
+            fstream = new FileWriter(OUTPUT_FILE);
             BufferedWriter out = new BufferedWriter(fstream);
             out.write(content);
             out.close();
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            IOUtils.closeQuietly(fstream);
         }
     }