Merge pull request #681 from dbrant/crash2

Fix crash when uploading multiple photos.
This commit is contained in:
Dinu Kumarasiri 2017-05-26 23:35:37 +05:30 committed by GitHub
commit 40c1ea375a
2 changed files with 7 additions and 10 deletions

View file

@ -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();

View file

@ -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);