Removed unused code
This commit is contained in:
parent
fe92c98661
commit
9df23ebbf6
|
@ -690,7 +690,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
|
|||
if(controller == null || controller.getMedia() == null) {
|
||||
return false;
|
||||
}
|
||||
Playable media = controller.getMedia();
|
||||
SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
|
||||
showTimeLeft = prefs.getBoolean(PREF_SHOW_TIME_LEFT, false);
|
||||
onPositionObserverUpdate();
|
||||
|
|
|
@ -121,15 +121,6 @@ public class DownloadlistAdapter extends BaseAdapter {
|
|||
ImageButton butSecondary;
|
||||
}
|
||||
|
||||
public int getSelectedItemIndex() {
|
||||
return selectedItemIndex;
|
||||
}
|
||||
|
||||
public void setSelectedItemIndex(int selectedItemIndex) {
|
||||
this.selectedItemIndex = selectedItemIndex;
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
public interface ItemAccess {
|
||||
int getCount();
|
||||
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
package de.danoeh.antennapod.core.asynctask;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v4.content.AsyncTaskLoader;
|
||||
|
||||
/**
|
||||
* Subclass of AsyncTaskLoader that is made for loading data with one of the DB*-classes.
|
||||
* This class will provide a useful default implementation that would otherwise always be necessary when interacting
|
||||
* with the DB*-classes with an AsyncTaskLoader.
|
||||
*/
|
||||
abstract class DBTaskLoader<D> extends AsyncTaskLoader<D> {
|
||||
|
||||
public DBTaskLoader(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStopLoading() {
|
||||
super.onStopLoading();
|
||||
cancelLoad();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStartLoading() {
|
||||
super.onStartLoading();
|
||||
// according to https://code.google.com/p/android/issues/detail?id=14944, this has to be called manually
|
||||
forceLoad();
|
||||
}
|
||||
}
|
|
@ -109,7 +109,6 @@ public class UserPreferences {
|
|||
// Experimental
|
||||
public static final String PREF_SONIC = "prefSonic";
|
||||
private static final String PREF_STEREO_TO_MONO = "PrefStereoToMono";
|
||||
public static final String PREF_NORMALIZER = "prefNormalizer";
|
||||
public static final String PREF_CAST_ENABLED = "prefCast"; //Used for enabling Chromecast support
|
||||
public static final int EPISODE_CLEANUP_QUEUE = -1;
|
||||
public static final int EPISODE_CLEANUP_NULL = -2;
|
||||
|
@ -122,7 +121,6 @@ public class UserPreferences {
|
|||
private static final int EPISODE_CACHE_SIZE_UNLIMITED = -1;
|
||||
public static final int FEED_ORDER_COUNTER = 0;
|
||||
public static final int FEED_ORDER_ALPHABETICAL = 1;
|
||||
public static final int FEED_ORDER_LAST_UPDATE = 2;
|
||||
public static final int FEED_ORDER_MOST_PLAYED = 3;
|
||||
public static final int FEED_COUNTER_SHOW_NEW_UNPLAYED_SUM = 0;
|
||||
public static final int FEED_COUNTER_SHOW_NEW = 1;
|
||||
|
|
|
@ -211,10 +211,6 @@ public class DownloadRequest implements Parcelable {
|
|||
this.size = size;
|
||||
}
|
||||
|
||||
public int getStatusMsg() {
|
||||
return statusMsg;
|
||||
}
|
||||
|
||||
public void setStatusMsg(int statusMsg) {
|
||||
this.statusMsg = statusMsg;
|
||||
}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
package de.danoeh.antennapod.core.service.download;
|
||||
|
||||
/**
|
||||
* Callback used by the Downloader-classes to notify the requester that the
|
||||
* download has completed.
|
||||
*/
|
||||
public interface DownloaderCallback {
|
||||
|
||||
void onDownloadCompleted(Downloader downloader);
|
||||
}
|
|
@ -838,23 +838,6 @@ public final class DBReader {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches the DB for a FeedImage of the given id.
|
||||
*
|
||||
* @param imageId The id of the object
|
||||
* @return The found object
|
||||
*/
|
||||
public static FeedImage getFeedImage(final long imageId) {
|
||||
Log.d(TAG, "getFeedImage() called with: " + "imageId = [" + imageId + "]");
|
||||
PodDBAdapter adapter = PodDBAdapter.getInstance();
|
||||
adapter.open();
|
||||
try {
|
||||
return getFeedImage(adapter, imageId);
|
||||
} finally {
|
||||
adapter.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches the DB for a FeedImage of the given id.
|
||||
*
|
||||
|
|
|
@ -236,27 +236,6 @@ public final class DBTasks {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads all pages of the given feed.
|
||||
*
|
||||
* @param context Used for requesting the download.
|
||||
* @param feed The Feed object.
|
||||
*/
|
||||
public static void refreshCompleteFeed(final Context context, final Feed feed) {
|
||||
try {
|
||||
refreshFeed(context, feed, true, false);
|
||||
} catch (DownloadRequestException e) {
|
||||
e.printStackTrace();
|
||||
DBWriter.addDownloadStatus(
|
||||
new DownloadStatus(feed, feed
|
||||
.getHumanReadableIdentifier(),
|
||||
DownloadError.ERROR_REQUEST_ERROR, false, e
|
||||
.getMessage()
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads all pages of the given feed even if feed has not been modified since last refresh
|
||||
*
|
||||
|
@ -377,27 +356,6 @@ public final class DBTasks {
|
|||
EventDistributor.getInstance().sendFeedUpdateBroadcast();
|
||||
}
|
||||
|
||||
/**
|
||||
* Request the download of all objects in the queue. from a separate Thread.
|
||||
*
|
||||
* @param context Used for requesting the download an accessing the database.
|
||||
*/
|
||||
public static void downloadAllItemsInQueue(final Context context) {
|
||||
new Thread() {
|
||||
public void run() {
|
||||
List<FeedItem> queue = DBReader.getQueue();
|
||||
if (!queue.isEmpty()) {
|
||||
try {
|
||||
downloadFeedItems(context,
|
||||
queue.toArray(new FeedItem[queue.size()]));
|
||||
} catch (DownloadRequestException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Requests the download of a list of FeedItem objects.
|
||||
*
|
||||
|
|
|
@ -482,22 +482,6 @@ public class DBWriter {
|
|||
});
|
||||
}
|
||||
|
||||
public static Future<?> addFavoriteItemById(final long itemId) {
|
||||
return dbExec.submit(() -> {
|
||||
final FeedItem item = DBReader.getFeedItem(itemId);
|
||||
if (item == null) {
|
||||
Log.d(TAG, "Can't find item for itemId " + itemId);
|
||||
return;
|
||||
}
|
||||
final PodDBAdapter adapter = PodDBAdapter.getInstance().open();
|
||||
adapter.addFavoriteItem(item);
|
||||
adapter.close();
|
||||
item.addTag(FeedItem.TAG_FAVORITE);
|
||||
EventBus.getDefault().post(FavoritesEvent.added(item));
|
||||
EventBus.getDefault().post(FeedItemEvent.updated(item));
|
||||
});
|
||||
}
|
||||
|
||||
public static Future<?> removeFavoriteItem(final FeedItem item) {
|
||||
return dbExec.submit(() -> {
|
||||
final PodDBAdapter adapter = PodDBAdapter.getInstance().open();
|
||||
|
|
|
@ -607,31 +607,6 @@ public class PodDBAdapter {
|
|||
new String[]{String.valueOf(FlattrStatus.STATUS_QUEUE)}, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Counts feeds and feed items in the flattr queue
|
||||
*/
|
||||
public int getFlattrQueueSize() {
|
||||
int res = 0;
|
||||
Cursor c = db.rawQuery(String.format("SELECT count(*) FROM %s WHERE %s=%s",
|
||||
TABLE_NAME_FEEDS, KEY_FLATTR_STATUS, String.valueOf(FlattrStatus.STATUS_QUEUE)), null);
|
||||
if (c.moveToFirst()) {
|
||||
res = c.getInt(0);
|
||||
c.close();
|
||||
} else {
|
||||
Log.e(TAG, "Unable to determine size of flattr queue: Could not count number of feeds");
|
||||
}
|
||||
c = db.rawQuery(String.format("SELECT count(*) FROM %s WHERE %s=%s",
|
||||
TABLE_NAME_FEED_ITEMS, KEY_FLATTR_STATUS, String.valueOf(FlattrStatus.STATUS_QUEUE)), null);
|
||||
if (c.moveToFirst()) {
|
||||
res += c.getInt(0);
|
||||
c.close();
|
||||
} else {
|
||||
Log.e(TAG, "Unable to determine size of flattr queue: Could not count number of feed items");
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the download URL of a Feed.
|
||||
*/
|
||||
|
@ -944,17 +919,6 @@ public class PodDBAdapter {
|
|||
return count > 0;
|
||||
}
|
||||
|
||||
public long getDownloadLogSize() {
|
||||
final String query = String.format("SELECT COUNT(%s) FROM %s", KEY_ID, TABLE_NAME_DOWNLOAD_LOG);
|
||||
Cursor result = db.rawQuery(query, null);
|
||||
long count = 0;
|
||||
if (result.moveToFirst()) {
|
||||
count = result.getLong(0);
|
||||
}
|
||||
result.close();
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setQueue(List<FeedItem> queue) {
|
||||
ContentValues values = new ContentValues();
|
||||
try {
|
||||
|
@ -1093,18 +1057,6 @@ public class PodDBAdapter {
|
|||
null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a cursor for a DB query in the FeedMedia table for a given ID.
|
||||
*
|
||||
* @param item The item you want to get the FeedMedia from
|
||||
* @return The cursor of the query
|
||||
*/
|
||||
public final Cursor getFeedMediaOfItemCursor(final FeedItem item) {
|
||||
return db.query(TABLE_NAME_FEED_MEDIA, null, KEY_ID + "=?",
|
||||
new String[]{String.valueOf(item.getMedia().getId())}, null,
|
||||
null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a cursor for a DB query in the FeedImages table for given IDs.
|
||||
*
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
package de.danoeh.antennapod.core.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.danoeh.antennapod.core.feed.FeedItem;
|
||||
|
||||
class EpisodeFilter {
|
||||
|
||||
private EpisodeFilter() {
|
||||
|
||||
}
|
||||
|
||||
/** Return a copy of the itemlist without items which have no media. */
|
||||
public static ArrayList<FeedItem> getEpisodeList(List<FeedItem> items) {
|
||||
ArrayList<FeedItem> episodes = new ArrayList<>(items);
|
||||
for (FeedItem item : items) {
|
||||
if (item.getMedia() == null) {
|
||||
episodes.remove(item);
|
||||
}
|
||||
}
|
||||
return episodes;
|
||||
}
|
||||
|
||||
public static int countItemsWithEpisodes(List<FeedItem> items) {
|
||||
int count = 0;
|
||||
for (FeedItem item : items) {
|
||||
if (item.getMedia() != null) {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
public static FeedItem accessEpisodeByIndex(List<FeedItem> items,
|
||||
int position) {
|
||||
int count = 0;
|
||||
for (FeedItem item : items) {
|
||||
|
||||
if (item.getMedia() != null) {
|
||||
if (count == position) {
|
||||
return item;
|
||||
} else {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -58,19 +58,4 @@ public abstract class QueueAccess {
|
|||
};
|
||||
}
|
||||
|
||||
public static QueueAccess NotInQueueAccess() {
|
||||
return new QueueAccess() {
|
||||
@Override
|
||||
public boolean contains(long id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean remove(long id) {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -12,11 +12,6 @@ public class MediaFileNotFoundException extends Exception {
|
|||
this.media = media;
|
||||
}
|
||||
|
||||
public MediaFileNotFoundException(FeedMedia media) {
|
||||
super();
|
||||
this.media = media;
|
||||
}
|
||||
|
||||
public FeedMedia getMedia() {
|
||||
return media;
|
||||
}
|
||||
|
|
|
@ -131,14 +131,6 @@ public class RemoteMedia implements Playable {
|
|||
return feedUrl;
|
||||
}
|
||||
|
||||
public FeedMedia lookForFeedMedia() {
|
||||
FeedItem feedItem = DBReader.getFeedItem(feedUrl, itemIdentifier);
|
||||
if (feedItem == null) {
|
||||
return null;
|
||||
}
|
||||
return feedItem.getMedia();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToPreferences(SharedPreferences.Editor prefEditor) {
|
||||
//it seems pointless to do it, since the session should be kept by the remote device.
|
||||
|
|
Loading…
Reference in New Issue