Skip to content

BugFix issue #2791 #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 30, 2019
Merged

BugFix issue #2791 #2792

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d397b9
BugFix issue #2791
ashishkumar468 Mar 28, 2019
c4ae082
Update app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragmen…
domdomegg Mar 29, 2019
1c60da0
null check on getActivity() before calling enableDeleteButton
ashishkumar468 Mar 29, 2019
3439653
Merge branch 'bugfix/npeinmediadetailsfragment' of https://github.com…
ashishkumar468 Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Intent;
import android.database.DataSetObserver;
import android.net.Uri;
Expand All @@ -24,15 +22,6 @@
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;

import javax.inject.Inject;
import javax.inject.Provider;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
Expand All @@ -56,9 +45,14 @@
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import javax.inject.Inject;
import javax.inject.Provider;
import timber.log.Timber;

import static android.content.Context.CLIPBOARD_SERVICE;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_SHORT;
Expand All @@ -71,7 +65,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
private int index;
private Locale locale;
private boolean isDeleted = false;

private DeleteTask deleteTask;

public static MediaDetailFragment forMedia(int index, boolean editable, boolean isCategoryImage) {
MediaDetailFragment mf = new MediaDetailFragment();
Expand Down Expand Up @@ -336,6 +330,11 @@ public void onDestroyView() {
detailProvider.unregisterDataSetObserver(dataObserver);
dataObserver = null;
}

if (deleteTask != null) {
deleteTask.cancel(true);
deleteTask = null;
}
super.onDestroyView();
}

Expand Down Expand Up @@ -424,10 +423,12 @@ private void onDeleteClicked(Spinner spinner) {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(s -> {
DeleteTask deleteTask = new DeleteTask(getActivity(), media, reason);
deleteTask.execute();
isDeleted = true;
enableDeleteButton(false);
if (getActivity() != null) {
deleteTask = new DeleteTask(getActivity(), media, reason);
deleteTask.execute();
isDeleted = true;
enableDeleteButton(false);
}
});
}

Expand Down