From f1f0f4a359319b6f20af72d031207a7d183b7d4a Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Fri, 20 Mar 2020 12:45:37 +0000
Subject: [PATCH] Fix Crash

---
 .../contributions/ContributionViewHolder.java |  8 +++---
 .../ContributionsListAdapter.java             | 15 ++++++-----
 .../ContributionsListFragment.java            | 25 ++++++++-----------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
index 740cfbd05..c3633aa27 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
@@ -24,7 +24,6 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
 import timber.log.Timber;
 
 public class ContributionViewHolder extends RecyclerView.ViewHolder {
@@ -40,16 +39,17 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
     @BindView(R.id.contributionProgress) ProgressBar progressView;
     @BindView(R.id.failed_image_options) LinearLayout failedImageOptions;
 
-    @Inject
-    MediaClient mediaClient;
 
     private int position;
     private Contribution contribution;
     private Random random = new Random();
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
+    private final MediaClient mediaClient;
 
-    ContributionViewHolder(View parent, Callback callback) {
+    ContributionViewHolder(View parent, Callback callback,
+        MediaClient mediaClient) {
         super(parent);
+        this.mediaClient = mediaClient;
         ButterKnife.bind(this, parent);
         this.callback=callback;
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
index 8b8d2fff1..a26b86205 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
@@ -1,29 +1,28 @@
 package fr.free.nrw.commons.contributions;
 
-import android.os.Handler;
-import android.os.Looper;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.media.MediaClient;
 import java.util.ArrayList;
 import java.util.List;
 
-import fr.free.nrw.commons.R;
-
 /**
  * Represents The View Adapter for the List of Contributions  
  */
 public class ContributionsListAdapter extends RecyclerView.Adapter<ContributionViewHolder> {
 
     private Callback callback;
+    private final MediaClient mediaClient;
     private List<Contribution> contributions;
 
-    public ContributionsListAdapter(Callback callback) {
+    public ContributionsListAdapter(Callback callback,
+        MediaClient mediaClient) {
         this.callback = callback;
+        this.mediaClient = mediaClient;
         contributions = new ArrayList<>();
     }
 
@@ -36,7 +35,7 @@ public class ContributionsListAdapter extends RecyclerView.Adapter<ContributionV
     public ContributionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         ContributionViewHolder viewHolder = new ContributionViewHolder(
                 LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.layout_contribution, parent, false), callback);
+                        .inflate(R.layout.layout_contribution, parent, false), callback, mediaClient);
         return viewHolder;
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index a4ab14a4d..d7f813c6d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -1,5 +1,8 @@
 package fr.free.nrw.commons.contributions;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,31 +13,24 @@ import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.LayoutManager;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionsListAdapter.Callback;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
+import fr.free.nrw.commons.media.MediaClient;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 /**
  * Created by root on 01.06.2018.
@@ -60,6 +56,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     @Inject @Named("default_preferences") JsonKvStore kvStore;
     @Inject ContributionController controller;
+    @Inject MediaClient mediaClient;
 
     private Animation fab_close;
     private Animation fab_open;
@@ -89,7 +86,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
     }
 
     private void initAdapter() {
-        adapter = new ContributionsListAdapter(callback);
+        adapter = new ContributionsListAdapter(callback, mediaClient);
         adapter.setHasStableIds(true);
     }