Skip to content
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

Jump to bottom

Remove item delete functionality #1936

Merged
merged 1 commit into from
Aug 9, 2022
Merged

Remove item delete functionality #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 0 additions & 37 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,29 +872,6 @@ private void gotoSeries() {
mActivity.startActivity(intent);
}

private void deleteItem() {
new AlertDialog.Builder(mActivity)
.setTitle(R.string.lbl_delete)
.setMessage("This will PERMANENTLY DELETE " + mBaseItem.getName() + " from your library. Are you VERY sure?")
.setPositiveButton("Delete",
(dialog, whichButton) -> apiClient.getValue().DeleteItem(mBaseItem.getId(), new EmptyResponse() {
@Override
public void onResponse() {
Utils.showToast(mActivity, mBaseItem.getName() + " Deleted");
dataRefreshService.getValue().setLastDeletedItemId(mBaseItem.getId());
finish();
}

@Override
public void onError(Exception ex) {
Utils.showToast(mActivity, ex.getLocalizedMessage());
}
}))
.setNegativeButton("Cancel", (dialog, which) -> Utils.showToast(mActivity, "Item NOT Deleted"))
.show()
.getButton(AlertDialog.BUTTON_NEGATIVE).requestFocus();
}

private TextUnderButton favButton = null;
private TextUnderButton shuffleButton = null;
private TextUnderButton goToSeriesButton = null;
Expand Down Expand Up @@ -1257,17 +1234,6 @@ public void onClick(View v) {
mDetailsOverviewRow.addAction(goToSeriesButton);
}

if ((mBaseItem.getBaseItemType() == BaseItemType.Recording && KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getPolicy().getEnableLiveTvManagement() && mBaseItem.getCanDelete()) ||
((mBaseItem.getBaseItemType() == BaseItemType.Movie || mBaseItem.getBaseItemType() == BaseItemType.Episode || mBaseItem.getBaseItemType() == BaseItemType.Video) && KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getPolicy().getEnableContentDeletion())) {
deleteButton = TextUnderButton.create(this, R.drawable.ic_trash, buttonSize, 0, getString(R.string.lbl_delete), new View.OnClickListener() {
@Override
public void onClick(View v) {
deleteItem();
}
});
mDetailsOverviewRow.addAction(deleteButton);
}

if (mSeriesTimerInfo != null && mBaseItem.getBaseItemType() == BaseItemType.SeriesTimer) {
//Settings
mDetailsOverviewRow.addAction(TextUnderButton.create(this, R.drawable.ic_settings, buttonSize, 0, getString(R.string.lbl_series_settings), new View.OnClickListener() {
Expand Down Expand Up @@ -1454,9 +1420,6 @@ public boolean onMenuItemClick(MenuItem item) {
case R.id.addQueue:
addItemToQueue();
return true;
case R.id.delete:
deleteItem();
return true;
}
return false;
}
Expand Down
48 changes: 12 additions & 36 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/ItemListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.jellyfin.androidtv.util.apiclient.BaseItemUtils;
import org.jellyfin.androidtv.util.apiclient.PlaybackHelper;
import org.jellyfin.apiclient.interaction.ApiClient;
import org.jellyfin.apiclient.interaction.EmptyResponse;
import org.jellyfin.apiclient.interaction.Response;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.BaseItemType;
Expand Down Expand Up @@ -637,10 +636,10 @@ public void onClick(View v) {
}));
}

TextUnderButton delete = TextUnderButton.create(this, R.drawable.ic_trash, buttonSize, 0, getString(R.string.lbl_delete), new View.OnClickListener() {
@Override
public void onClick(final View v) {
if (mBaseItem.getId().equals(VIDEO_QUEUE)) {
if (mBaseItem.getId().equals(VIDEO_QUEUE)) {
TextUnderButton delete = TextUnderButton.create(this, R.drawable.ic_trash, buttonSize, 0, getString(R.string.lbl_delete), new View.OnClickListener() {
@Override
public void onClick(final View v) {
new AlertDialog.Builder(mActivity)
.setTitle(R.string.lbl_clear_queue)
.setMessage(R.string.clear_expanded)
Expand All @@ -649,41 +648,18 @@ public void onClick(final View v) {
dataRefreshService.getValue().setLastVideoQueueChange(System.currentTimeMillis());
finish();
})
.setNegativeButton(R.string.btn_cancel, (dialog, which) -> {})
.show()
.getButton(AlertDialog.BUTTON_NEGATIVE).requestFocus();
} else {
new AlertDialog.Builder(mActivity)
.setTitle(R.string.lbl_delete)
.setMessage(getString(R.string.delete_warning, mBaseItem.getName()))
.setPositiveButton(R.string.lbl_delete,
(dialog, whichButton) -> apiClient.getValue().DeleteItem(mBaseItem.getId(), new EmptyResponse() {
@Override
public void onResponse() {
Utils.showToast(mActivity, getString(R.string.lbl_deleted, mBaseItem.getName()));
dataRefreshService.getValue().setLastDeletedItemId(mBaseItem.getId());
finish();
}

@Override
public void onError(Exception ex) {
Utils.showToast(mActivity, ex.getLocalizedMessage());
}
}))
.setNegativeButton(R.string.btn_cancel,
(dialog, which) -> Utils.showToast(mActivity, R.string.not_deleted))
.setNegativeButton(R.string.btn_cancel, (dialog, which) -> {
})
.show()
.getButton(AlertDialog.BUTTON_NEGATIVE).requestFocus();


}
}
});
});

mButtonRow.addView(delete);
delete.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) mScrollView.smoothScrollTo(0, 0);
});
mButtonRow.addView(delete);
delete.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) mScrollView.smoothScrollTo(0, 0);
});
}
}
}

Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/menu/menu_details_more.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@
<item
android:id="@+id/gotoSeries"
android:title="@string/lbl_goto_series" />
<item
android:id="@+id/delete"
android:title="@string/lbl_delete" />
</menu>
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@
<string name="no_player_message">It doesn\'t appear you have a video capable app installed. This option requires you install a 3rd party application for playing video content.</string>
<string name="lbl_clear">Clear</string>
<string name="clear_expanded">Clear current video queue?</string>
<string name="delete_warning">This will PERMANENTLY DELETE %1$s from your library. Are you VERY sure?</string>
<string name="episode_missing">Episode Missing</string>
<string name="episode_missing_message">This episode is missing from your library. Would you like to skip it and continue to the next one?</string>
<string name="episode_missing_message_2">This episode is missing from your library. Playback will stop.</string>
Expand Down