Skip to content

Fix random deletion issue #2986

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

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Fix random deletion issue #2986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb4edd
Fix random deletion issue
sonusourav Jan 20, 2020
a937793
Merge branch 'development' into deleteAll
mariobehling Sep 28, 2020
6716bec
Merge branch 'development' into deleteAll
sonusourav Sep 29, 2020
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
14 changes: 7 additions & 7 deletions app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package org.fossasia.phimpme.gallery.activities;

import static org.fossasia.phimpme.gallery.data.base.SortingMode.DATE;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.NAME;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.NUMERIC;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.SIZE;
import static org.fossasia.phimpme.utilities.ActivitySwitchHelper.context;

import android.Manifest;
import android.animation.Animator;
import android.annotation.TargetApi;
Expand Down Expand Up @@ -143,6 +137,12 @@
import org.fossasia.phimpme.utilities.NotificationHandler;
import org.fossasia.phimpme.utilities.SnackBarHandler;

import static org.fossasia.phimpme.gallery.data.base.SortingMode.DATE;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.NAME;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.NUMERIC;
import static org.fossasia.phimpme.gallery.data.base.SortingMode.SIZE;
import static org.fossasia.phimpme.utilities.ActivitySwitchHelper.context;

public class LFMainActivity extends SharedMediaActivity {

private static String TAG = "AlbumsAct";
Expand Down Expand Up @@ -1819,7 +1819,7 @@ public boolean onPrepareOptionsMenu(final Menu menu) {
&& !hidden
&& getAlbums().getSelectedCount() == 1);
menu.findItem(R.id.delete_action)
.setVisible((!albumsMode || editMode) && (!all_photos || editMode));
.setVisible(editMode);
if (fav_photos) {
menu.findItem(R.id.delete_action).setVisible(editMode);
}
Expand Down