diff options
9 files changed, 10 insertions, 23 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java index cd3847f17..161393b8a 100644 --- a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java +++ b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java @@ -29,7 +29,7 @@ public class GPodnetServiceTest { private static final String PW = ""; @Before - protected void setUp() { + public void setUp() { service = new GpodnetService(); } diff --git a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java index 70aec1580..00eef5c8d 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java @@ -44,7 +44,7 @@ public class AutoDownloadTest { public void setUp() throws Exception { context = ApplicationProvider.getApplicationContext(); - stubFeedsServer = new UITestUtils(context);; + stubFeedsServer = new UITestUtils(context); stubFeedsServer.setup(); dbTasksCallbacksOrig = ClientConfig.dbTasksCallbacks; @@ -130,7 +130,7 @@ public class AutoDownloadTest { } private void useDownloadAlgorithm(final AutomaticDownloadAlgorithm downloadAlgorithm) { - DBTasksCallbacks dbTasksCallbacksStub = new DBTasksCallbacks() { + ClientConfig.dbTasksCallbacks = new DBTasksCallbacks() { @Override public AutomaticDownloadAlgorithm getAutomaticDownloadAlgorithm() { return downloadAlgorithm; @@ -141,7 +141,6 @@ public class AutoDownloadTest { return dbTasksCallbacksOrig.getEpisodeCacheCleanupAlgorithm(); } }; - ClientConfig.dbTasksCallbacks = dbTasksCallbacksStub; } private class StubDownloadAlgorithm implements AutomaticDownloadAlgorithm { diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java index 1e13bd5c3..10ca281cb 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java @@ -322,15 +322,11 @@ public class DBWriterTest { feed.setImageUrl("url"); - List<File> itemFiles = new ArrayList<>(); // create items with downloaded media files for (int i = 0; i < 10; i++) { FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed); feed.getItems().add(item); - File enc = new File(destFolder, "file " + i); - itemFiles.add(enc); - FeedMedia media = new FeedMedia(0, item, 1, 1, 1, "mime_type", enc.getAbsolutePath(), "download_url", false, null, 0, 0); item.setMedia(media); } @@ -387,15 +383,11 @@ public class DBWriterTest { feed.setImageUrl("url"); - List<File> itemFiles = new ArrayList<>(); // create items with downloaded media files for (int i = 0; i < 10; i++) { FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed); feed.getItems().add(item); - File enc = new File(destFolder, "file " + i); - itemFiles.add(enc); - FeedMedia media = new FeedMedia(0, item, 1, 1, 1, "mime_type", enc.getAbsolutePath(), "download_url", false, null, 0, 0); item.setMedia(media); } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index 31b708443..0023e6d7f 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -317,8 +317,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi fragment = new AddFeedFragment(); break; case SubscriptionFragment.TAG: - SubscriptionFragment subscriptionFragment = new SubscriptionFragment(); - fragment = subscriptionFragment; + fragment = new SubscriptionFragment(); break; default: // default to the queue diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index a97d60099..85978b761 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -144,7 +144,6 @@ public class ItemDescriptionFragment extends Fragment { } }; - @SuppressWarnings("deprecation") @SuppressLint("NewApi") @Override public boolean onContextItemSelected(MenuItem item) { diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java index e79389fb3..4c116fa2d 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java +++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java @@ -88,7 +88,7 @@ public class AspectRatioVideoView extends VideoView { mVideoWidth = videoWidth; mVideoHeight = videoHeight; - /** + /* * If this isn't set the video is stretched across the * SurfaceHolders display surface (i.e. the SurfaceHolder * as the same size and the video is drawn to fit this diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 0cc13f74c..211f6c9ef 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -20,7 +20,7 @@ tools:listitem="@layout/gpodnet_podcast_listitem" /> <TextView - android:id="@id/android:empty" + android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerInParent="true" diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 708bea7d6..a928f3529 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -304,7 +304,7 @@ public class UserPreferences { } public enum EnqueueLocation { - BACK, FRONT, AFTER_CURRENTLY_PLAYING; + BACK, FRONT, AFTER_CURRENTLY_PLAYING } @NonNull @@ -566,8 +566,7 @@ public class UserPreferences { prefs.edit().putString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE).apply(); cacheSizeInt = Integer.parseInt(IMAGE_CACHE_DEFAULT_VALUE); } - int cacheSizeMB = cacheSizeInt * 1024 * 1024; - return cacheSizeMB; + return cacheSizeInt * 1024 * 1024; } public static int getFastForwardSecs() { @@ -791,8 +790,7 @@ public class UserPreferences { } public static String getMediaPlayer() { - String s = prefs.getString(PREF_MEDIA_PLAYER, "blaah"); - return s; + return prefs.getString(PREF_MEDIA_PLAYER, PREF_MEDIA_PLAYER_EXOPLAYER); } public static boolean useSonic() { diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java b/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java index 96a18506d..e3a10b14a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java @@ -25,7 +25,7 @@ public enum SortOrder { SMART_SHUFFLE_NEW_OLD(105, INTER_FEED); public enum Scope { - INTRA_FEED, INTER_FEED; + INTRA_FEED, INTER_FEED } public final int code; |