Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enqueue and items in the currently display order, submit changes on bulk

This commit is contained in:
Martin Fietz 2015-06-27 22:17:18 +02:00
parent c64217e2b4
commit 957497d787
3 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
View File

@ -8,7 +8,6 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -240,7 +239,6 @@ public class EpisodesApplyActionFragment extends Fragment {
}
private void sortByTitle(final boolean reverse) {
Log.d(TAG, "sortByTitle()");
Collections.sort(episodes, new Comparator<FeedItem>() {
@Override
public int compare(FeedItem lhs, FeedItem rhs) {
@ -293,8 +291,7 @@ public class EpisodesApplyActionFragment extends Fragment {
}
private void checkAll() {
for(int i=0; i < episodes.size(); i++) {
FeedItem episode = episodes.get(i);
for (FeedItem episode : episodes) {
if(false == checkedIds.contains(episode.getId())) {
checkedIds.add(episode.getId());
}
@ -308,8 +305,7 @@ public class EpisodesApplyActionFragment extends Fragment {
}
private void checkPlayed(boolean isPlayed) {
for (int i = 0; i < episodes.size(); i++) {
FeedItem episode = episodes.get(i);
for (FeedItem episode : episodes) {
if(episode.isRead() == isPlayed) {
if(!checkedIds.contains(episode.getId())) {
checkedIds.add(episode.getId());
@ -324,8 +320,7 @@ public class EpisodesApplyActionFragment extends Fragment {
}
private void checkDownloaded(boolean isDownloaded) {
for (int i = 0; i < episodes.size(); i++) {
FeedItem episode = episodes.get(i);
for (FeedItem episode : episodes) {
if(episode.getMedia().isDownloaded() == isDownloaded) {
if(!checkedIds.contains(episode.getId())) {
checkedIds.add(episode.getId());
@ -357,32 +352,36 @@ public class EpisodesApplyActionFragment extends Fragment {
}
private void queueChecked() {
DBWriter.addQueueItem(getActivity(), false, checkedIds.toArray());
LongList orderedIds = new LongList();
for(FeedItem episode : episodes) {
if(checkedIds.contains(episode.getId())) {
orderedIds.add((episode.getId()));
}
}
DBWriter.addQueueItem(getActivity(), false, orderedIds.toArray());
close();
}
private void markedCheckedPlayed() {
for(long id : checkedIds.toArray()) {
DBWriter.markItemRead(getActivity(), id, true);
}
DBWriter.markItemRead(getActivity(), true, checkedIds.toArray());
close();
}
private void markedCheckedUnplayed() {
for(long id : checkedIds.toArray()) {
DBWriter.markItemRead(getActivity(), id, false);
}
DBWriter.markItemRead(getActivity(), false, checkedIds.toArray());
close();
}
private void downloadChecked() {
FeedItem[] items = new FeedItem[checkedIds.size()];
for(int i=0; i < checkedIds.size(); i++) {
long id = checkedIds.get(i);
items[i] = findById(id);
// download the check episodes in the same order as they are currently displayed
List<FeedItem> toDownload = new ArrayList<FeedItem>(checkedIds.size());
for(FeedItem episode : episodes) {
if(checkedIds.contains(episode.getId())) {
toDownload.add(episode);
}
}
try {
DBTasks.downloadFeedItems(getActivity(), items);
DBTasks.downloadFeedItems(getActivity(), toDownload.toArray(new FeedItem[0]));
} catch (DownloadRequestException e) {
e.printStackTrace();
DownloadRequestErrorDialogCreator.newRequestErrorDialog(getActivity(), e.getMessage());

4
app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
View File

@ -72,7 +72,7 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
Log.d(TAG, "remove(" + which + ")");
stopItemLoader();
FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
DBWriter.markItemRead(getActivity(), item.getId(), true);
DBWriter.markItemRead(getActivity(), true, item.getId());
undoBarController.showUndoBar(false,
getString(R.string.marked_as_read_label), new FeedItemUndoToken(item,
which)
@ -88,7 +88,7 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
public void onUndo(FeedItemUndoToken token) {
if (token != null) {
long itemId = token.getFeedItemId();
DBWriter.markItemRead(context, itemId, false);
DBWriter.markItemRead(context, false, itemId);
}
}
@Override

20
core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
View File

@ -603,16 +603,24 @@ public class DBWriter {
adapter.close();
}
/**
* Sets the 'read'-attribute of a FeedItem to the specified value.
/*
* Sets the 'read'-attribute of all specified FeedItems
*
* @param context A context that is used for opening a database connection.
* @param itemId ID of the FeedItem
* @param read New value of the 'read'-attribute
* @param itemIds IDs of the FeedItems.
*/
public static Future<?> markItemRead(final Context context, final long itemId,
final boolean read) {
return markItemRead(context, itemId, read, 0, false);
public static Future<?> markItemRead(final Context context, final boolean read, final long... itemIds) {
return dbExec.submit(new Runnable() {
@Override
public void run() {
final PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setFeedItemRead(read, itemIds);
adapter.close();
EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
}
});
}