refactored avatar workers into single class

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 5b714984b..d269f11ac 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -38,6 +38,7 @@ import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.annotation.BoolRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
@@ -1228,11 +1229,12 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
     }
 
-    public static XmppActivity find(WeakReference<ImageView> viewWeakReference) {
+    public static XmppActivity find(@NonNull WeakReference<ImageView> viewWeakReference) {
         final View view = viewWeakReference.get();
-        if (view == null) {
-            return null;
-        }
+        return view == null ? null : find(view);
+    }
+
+    public static XmppActivity find(@NonNull final View view) {
         final Context context = view.getContext();
         if (context instanceof XmppActivity) {
             return (XmppActivity) context;