From 71459ed88e0c8a60bbe437386990567458fdfb9b Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 13 Feb 2016 07:26:01 +0100
Subject: [PATCH] Rename method to not clash with new one introduced in API 23

---
 .../java/com/fsck/k9/ui/messageview/AttachmentController.java   | 2 +-
 .../java/com/fsck/k9/ui/messageview/MessageViewFragment.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
index dd0cf7025..a9ae28bb2 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
@@ -47,7 +47,7 @@ public class AttachmentController {
 
     AttachmentController(MessagingController controller, DownloadManager downloadManager,
             MessageViewFragment messageViewFragment, AttachmentViewInfo attachment) {
-        this.context = messageViewFragment.getContext();
+        this.context = messageViewFragment.getApplicationContext();
         this.controller = controller;
         this.downloadManager = downloadManager;
         this.messageViewFragment = messageViewFragment;
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
index 48d79115b..fccf71fd9 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
@@ -656,7 +656,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
         }
     }
 
-    public Context getContext() {
+    public Context getApplicationContext() {
         return mContext;
     }