From 5923e9ad4a9d7ce776eec992d96e863edf69b82d Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Fri, 26 May 2017 13:35:40 -0400 Subject: [PATCH] Fix crash in PhotoDisplayAdapter. --- .../contributions/ContributionsListAdapter.java | 1 - .../upload/MultipleUploadListFragment.java | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) 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 604bf645e..08ed3198c 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 @@ -24,7 +24,6 @@ class ContributionsListAdapter extends CursorAdapter { return parent; } - //FIXME: Potential cause of wrong image display bug @Override public void bindView(View view, Context context, Cursor cursor) { final ContributionViewHolder views = (ContributionViewHolder)view.getTag(); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java index 06e18c679..52da98f54 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java @@ -24,12 +24,12 @@ import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; -import fr.free.nrw.commons.MediaWikiImageView; +import com.facebook.drawee.view.SimpleDraweeView; + import fr.free.nrw.commons.R; import fr.free.nrw.commons.contributions.Contribution; import fr.free.nrw.commons.media.MediaDetailPagerFragment; - public class MultipleUploadListFragment extends Fragment { public interface OnMultipleUploadInitiatedHandler { @@ -47,12 +47,10 @@ public class MultipleUploadListFragment extends Fragment { private boolean imageOnlyMode; private static class UploadHolderView { - Uri imageUri; - - MediaWikiImageView image; - TextView title; - - RelativeLayout overlay; + private Uri imageUri; + private SimpleDraweeView image; + private TextView title; + private RelativeLayout overlay; } private class PhotoDisplayAdapter extends BaseAdapter { @@ -79,7 +77,7 @@ public class MultipleUploadListFragment extends Fragment { if(view == null) { view = getLayoutInflater(null).inflate(R.layout.layout_upload_item, null); holder = new UploadHolderView(); - holder.image = (MediaWikiImageView) view.findViewById(R.id.uploadImage); + holder.image = (SimpleDraweeView) view.findViewById(R.id.uploadImage); holder.title = (TextView) view.findViewById(R.id.uploadTitle); holder.overlay = (RelativeLayout) view.findViewById(R.id.uploadOverlay);