From 187d760e5f48b42250f2f994ca7989631f1721e0 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 20 Oct 2014 19:50:41 -0400
Subject: [PATCH] Extract code to display error/status messages to a separate
 method

---
 src/com/fsck/k9/view/AttachmentView.java | 25 ++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java
index 9c16777fc..c7dc3841e 100644
--- a/src/com/fsck/k9/view/AttachmentView.java
+++ b/src/com/fsck/k9/view/AttachmentView.java
@@ -287,9 +287,8 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
              * Abort early if there's no place to save the attachment. We don't want to spend
              * the time downloading it and then abort.
              */
-            Toast.makeText(mContext,
-                    mContext.getString(R.string.message_view_status_attachment_not_saved),
-                    Toast.LENGTH_SHORT).show();
+            String message = mContext.getString(R.string.message_view_status_attachment_not_saved);
+            displayMessageToUser(message);
             return;
         }
         if (mMessage != null) {
@@ -309,22 +308,24 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
             mContext.startActivity(intent);
         } catch (Exception e) {
             Log.e(K9.LOG_TAG, "Could not display attachment of type " + contentType, e);
-            Toast toast = Toast.makeText(mContext, mContext.getString(R.string.message_view_no_viewer, contentType),
-                    Toast.LENGTH_LONG);
-            toast.show();
+
+            String message = mContext.getString(R.string.message_view_no_viewer, contentType);
+            displayMessageToUser(message);
         }
     }
 
     public void attachmentSaved(final String filename) {
-        Toast.makeText(mContext, String.format(
-                        mContext.getString(R.string.message_view_status_attachment_saved), filename),
-                Toast.LENGTH_LONG).show();
+        String message = mContext.getString(R.string.message_view_status_attachment_saved, filename);
+        displayMessageToUser(message);
     }
 
     public void attachmentNotSaved() {
-        Toast.makeText(mContext,
-                mContext.getString(R.string.message_view_status_attachment_not_saved),
-                Toast.LENGTH_LONG).show();
+        String message = mContext.getString(R.string.message_view_status_attachment_not_saved);
+        displayMessageToUser(message);
+    }
+
+    private void displayMessageToUser(String message) {
+        Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
     }
 
     public void setCallback(AttachmentFileDownloadCallback callback) {