1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 9d7624e79..f89d1a7c9 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -1123,7 +1123,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         ViewUtil.view(activity, file);
     }
 
-    public void showLocation(Message message) {
+    private void showLocation(Message message) {
         for (Intent intent : GeoHelper.createGeoIntentsFromMessage(this.getContext(), message)) {
             if (intent.resolveActivity(getContext().getPackageManager()) != null) {
                 getContext().startActivity(intent);
@@ -1139,7 +1139,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         this.mIndicateReceived = p.getBoolean("indicate_received", activity.getResources().getBoolean(R.bool.indicate_received));
     }
 
-    public void loadAvatar(Message message, ImageView imageView, int size) {
+    private void loadAvatar(Message message, ImageView imageView, int size) {
         if (cancelPotentialWork(message, imageView)) {
             final Bitmap bm = activity.avatarService().get(message, size, true);
             if (bm != null) {
@@ -1260,12 +1260,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         public void onDestroyActionMode(ActionMode mode) {}
     }
 
-    class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
+    private static class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
         private final WeakReference<ImageView> imageViewReference;
         private final int size;
         private Message message = null;
 
-        public BitmapWorkerTask(ImageView imageView, int size) {
+        BitmapWorkerTask(ImageView imageView, int size) {
             imageViewReference = new WeakReference<>(imageView);
             this.size = size;
         }
@@ -1273,6 +1273,10 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         @Override
         protected Bitmap doInBackground(Message... params) {
             this.message = params[0];
+            final XmppActivity activity = XmppActivity.find(imageViewReference);
+            if (activity == null) {
+                return null;
+            }
             return activity.avatarService().get(this.message, size, isCancelled());
         }