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

Fix sometimes not resetting media position #7147

Merged
merged 1 commit into from Apr 28, 2024
Merged

Fix sometimes not resetting media position #7147

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java
View file
Open in desktop
Expand Up @@ -728,20 +728,10 @@ public static Future<?> markItemPlayed(final int played, final boolean broadcast
*/
@NonNull
public static Future<?> markItemPlayed(FeedItem item, int played, boolean resetMediaPosition) {
long mediaId = (item.hasMedia()) ? item.getMedia().getId() : 0;
return markItemPlayed(item.getId(), played, mediaId, resetMediaPosition);
}

@NonNull
private static Future<?> markItemPlayed(final long itemId,
final int played,
final long mediaId,
final boolean resetMediaPosition) {
return runOnDbThread(() -> {
final PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open();
adapter.setFeedItemRead(played, itemId, mediaId,
resetMediaPosition);
adapter.setFeedItemRead(item, played, resetMediaPosition);
adapter.close();

EventBus.getDefault().post(new UnreadItemsUpdateEvent());
Expand Down
10 changes: 6 additions & 4 deletions storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java
View file
Open in desktop
Expand Up @@ -684,19 +684,21 @@ private long updateOrInsertFeedItem(FeedItem item, boolean saveFeed) {
return item.getId();
}

public void setFeedItemRead(int played, long itemId, long mediaId,
boolean resetMediaPosition) {
public void setFeedItemRead(FeedItem item, int played, boolean resetMediaPosition) {
try {
db.beginTransactionNonExclusive();
ContentValues values = new ContentValues();

values.put(KEY_READ, played);
db.update(TABLE_NAME_FEED_ITEMS, values, KEY_ID + "=?", new String[]{String.valueOf(itemId)});
db.update(TABLE_NAME_FEED_ITEMS, values, KEY_ID + "=?", new String[]{String.valueOf(item.getId())});
item.setPlayed(played == FeedItem.PLAYED);

if (resetMediaPosition) {
values.clear();
values.put(KEY_POSITION, 0);
db.update(TABLE_NAME_FEED_MEDIA, values, KEY_ID + "=?", new String[]{String.valueOf(mediaId)});
db.update(TABLE_NAME_FEED_MEDIA, values, KEY_ID + "=?",
new String[]{String.valueOf(item.getMedia().getId())});
item.getMedia().setPosition(0);
}

db.setTransactionSuccessful();
Expand Down