Merge branch 'develop' into folders

AntennaPod · ByteHamster · Mar 5, 2021 · Nov 2, 2020 · Nov 2, 2020 · Nov 3, 2020
commit f76d3ad09e41c544b8af2f33db0529e3bcdabc0e
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 2020000
-        versionName "2.2.0"
+        versionCode 2020001
+        versionName "2.2.0-beta1"
 
         multiDexEnabled false
         vectorDrawables.useSupportLibrary true

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -24,14 +24,14 @@
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.NavDrawerData;
-import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
 import de.danoeh.antennapod.fragment.EpisodesFragment;
 import de.danoeh.antennapod.fragment.NavDrawerFragment;
 import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
+import de.danoeh.antennapod.ui.common.ThemeUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.ref.WeakReference;

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -22,8 +22,8 @@
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.LocalFeedUpdater;
 import de.danoeh.antennapod.core.storage.NavDrawerData;
-import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.FeedItemlistFragment;
+import de.danoeh.antennapod.ui.common.ThemeUtils;
 import jp.shts.android.library.TriangleLabelView;
 
 /**
@@ -112,7 +112,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             boolean textAndImageCombined = feed.isLocalFeed()
                     && LocalFeedUpdater.getDefaultIconUrl(convertView.getContext()).equals(feed.getImageUrl());
             new CoverLoader(mainActivityRef.get())
-                    .withUri(feed.getImageLocation())
+                    .withUri(feed.getImageUrl())
                     .withPlaceholderView(holder.feedTitle, textAndImageCombined)
                     .withCoverView(holder.imageView)
                     .load();
@@ -123,7 +123,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
                     .withCoverView(holder.imageView)
                     .load();
         }
-
         return convertView;
     }
 

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java
@@ -164,6 +164,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                         setupEpisodeFilterPreference();
                         setupPlaybackSpeedPreference();
                         setupFeedAutoSkipPreference();
+                        setupEpisodeNotificationPreference();
                         setupTags();
 
                         updateAutoDeleteSummary();
@@ -412,14 +413,27 @@ private void setupTags() {
                             feedPreferences.getTags().clear();
                             feedPreferences.getTags().addAll(new HashSet<>(Arrays.asList(
                                     foldersString.split(FeedPreferences.TAG_SEPARATOR))));
-                            feed.savePreferences();
+                            DBWriter.setFeedPreferences(feedPreferences);
                         })
                         .setNegativeButton(R.string.cancel_label, null)
                         .show();
                 return true;
             });
         }
 
+        private void setupEpisodeNotificationPreference() {
+            SwitchPreferenceCompat pref = findPreference("episodeNotification");
+
+            pref.setChecked(feedPreferences.getShowEpisodeNotification());
+            pref.setOnPreferenceChangeListener((preference, newValue) -> {
+                boolean checked = newValue == Boolean.TRUE;
+                feedPreferences.setShowEpisodeNotification(checked);
+                DBWriter.setFeedPreferences(feedPreferences);
+                pref.setChecked(checked);
+                return false;
+            });
+        }
+
         private class ApplyToEpisodesDialog extends ConfirmationDialog {
             private final boolean autoDownload;
 

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
@@ -25,7 +25,6 @@ public enum AutoDeleteAction {
         YES,
         NO
     }
-    private AutoDeleteAction autoDeleteAction;
 
     @NonNull
     private FeedFilter filter;
@@ -39,16 +38,19 @@ public enum AutoDeleteAction {
     private float feedPlaybackSpeed;
     private int feedSkipIntro;
     private int feedSkipEnding;
+    private boolean showEpisodeNotification;
     private final Set<String> tags = new HashSet<>();
 
-    public FeedPreferences(long feedID, boolean autoDownload, AutoDeleteAction autoDeleteAction, VolumeAdaptionSetting volumeAdaptionSetting, String username, String password) {
+    public FeedPreferences(long feedID, boolean autoDownload, AutoDeleteAction autoDeleteAction,
+                           VolumeAdaptionSetting volumeAdaptionSetting, String username, String password) {
         this(feedID, autoDownload, true, autoDeleteAction, volumeAdaptionSetting,
-                username, password, new FeedFilter(), SPEED_USE_GLOBAL, 0, 0, new HashSet<>());
+                username, password, new FeedFilter(), SPEED_USE_GLOBAL, 0, 0, false, new HashSet<>());
     }
 
-    private FeedPreferences(long feedID, boolean autoDownload, boolean keepUpdated, AutoDeleteAction autoDeleteAction,
-                            VolumeAdaptionSetting volumeAdaptionSetting, String username, String password,
-                            @NonNull FeedFilter filter, float feedPlaybackSpeed, int feedSkipIntro, int feedSkipEnding,
+    private FeedPreferences(long feedID, boolean autoDownload, boolean keepUpdated,
+                            AutoDeleteAction autoDeleteAction, VolumeAdaptionSetting volumeAdaptionSetting,
+                            String username, String password, @NonNull FeedFilter filter, float feedPlaybackSpeed,
+                            int feedSkipIntro, int feedSkipEnding, boolean showEpisodeNotification,
                             Set<String> tags) {
         this.feedID = feedID;
         this.autoDownload = autoDownload;
@@ -61,6 +63,7 @@ private FeedPreferences(long feedID, boolean autoDownload, boolean keepUpdated,
         this.feedPlaybackSpeed = feedPlaybackSpeed;
         this.feedSkipIntro = feedSkipIntro;
         this.feedSkipEnding = feedSkipEnding;
+        this.showEpisodeNotification = showEpisodeNotification;
         this.tags.addAll(tags);
     }
 
@@ -77,6 +80,7 @@ public static FeedPreferences fromCursor(Cursor cursor) {
         int indexFeedPlaybackSpeed = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_PLAYBACK_SPEED);
         int indexAutoSkipIntro = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_SKIP_INTRO);
         int indexAutoSkipEnding = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_SKIP_ENDING);
+        int indexEpisodeNotification = cursor.getColumnIndex(PodDBAdapter.KEY_EPISODE_NOTIFICATION);
         int indexTags = cursor.getColumnIndex(PodDBAdapter.KEY_FEED_TAGS);
 
         long feedId = cursor.getLong(indexId);
@@ -93,11 +97,11 @@ public static FeedPreferences fromCursor(Cursor cursor) {
         float feedPlaybackSpeed = cursor.getFloat(indexFeedPlaybackSpeed);
         int feedAutoSkipIntro = cursor.getInt(indexAutoSkipIntro);
         int feedAutoSkipEnding = cursor.getInt(indexAutoSkipEnding);
+        boolean showNotification = cursor.getInt(indexEpisodeNotification) > 0;
         String tagsString = cursor.getString(indexTags);
         if (TextUtils.isEmpty(tagsString)) {
             tagsString = TAG_ROOT;
         }
-
         return new FeedPreferences(feedId,
                 autoDownload,
                 autoRefresh,
@@ -109,6 +113,7 @@ public static FeedPreferences fromCursor(Cursor cursor) {
                 feedPlaybackSpeed,
                 feedAutoSkipIntro,
                 feedAutoSkipEnding,
+                showNotification,
                 new HashSet<>(Arrays.asList(tagsString.split(TAG_SEPARATOR))));
     }
 
@@ -189,8 +194,8 @@ public VolumeAdaptionSetting getVolumeAdaptionSetting() {
         return volumeAdaptionSetting;
     }
 
-    public void setAutoDeleteAction(AutoDeleteAction auto_delete_action) {
-        this.autoDeleteAction = auto_delete_action;
+    public void setAutoDeleteAction(AutoDeleteAction autoDeleteAction) {
+        this.autoDeleteAction = autoDeleteAction;
     }
 
     public void setVolumeAdaptionSetting(VolumeAdaptionSetting volumeAdaptionSetting) {
@@ -256,4 +261,16 @@ public Set<String> getTags() {
     public String getTagsAsString() {
         return TextUtils.join(TAG_SEPARATOR, tags);
     }
+
+    /**
+     * getter for preference if notifications should be display for new episodes.
+     * @return true for displaying notifications
+     */
+    public boolean getShowEpisodeNotification() {
+        return showEpisodeNotification;
+    }
+
+    public void setShowEpisodeNotification(boolean showEpisodeNotification) {
+        this.showEpisodeNotification = showEpisodeNotification;
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBUpgrader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBUpgrader.java
@@ -311,6 +311,14 @@ static void upgrade(final SQLiteDatabase db, final int oldVersion, final int new
                     + " ADD COLUMN " + PodDBAdapter.KEY_FEED_SKIP_ENDING + " INTEGER DEFAULT 0;");
         }
         if (oldVersion < 2020000) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_EPISODE_NOTIFICATION + " INTEGER DEFAULT 0;");
+        }
+        if (oldVersion < 2030000) {
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " SET " + PodDBAdapter.KEY_DESCRIPTION + " = content_encoded, content_encoded = NULL "
+                    + "WHERE length(" + PodDBAdapter.KEY_DESCRIPTION + ") < length(content_encoded)");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + " SET content_encoded = NULL");
             db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
                     + " ADD COLUMN " + PodDBAdapter.KEY_FEED_TAGS + " TEXT;");
         }

diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -52,7 +52,7 @@ public class PodDBAdapter {
 
     private static final String TAG = "PodDBAdapter";
     public static final String DATABASE_NAME = "Antennapod.db";
-    public static final int VERSION = 2020000;
+    public static final int VERSION = 2030000;
 
     /**
      * Maximum number of arguments for IN-operator.
@@ -116,6 +116,7 @@ public class PodDBAdapter {
     public static final String KEY_FEED_SKIP_INTRO = "feed_skip_intro";
     public static final String KEY_FEED_SKIP_ENDING = "feed_skip_ending";
     public static final String KEY_FEED_TAGS = "tags";
+    public static final String KEY_EPISODE_NOTIFICATION = "episode_notification";
 
     // Table names
     public static final String TABLE_NAME_FEEDS = "Feeds";

diff --git a/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java
@@ -11,9 +11,7 @@
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.NavDrawerData;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.LongList;
 import org.junit.After;
 import org.junit.Before;
@@ -321,11 +319,11 @@ public void testGetPlaybackHistory() {
 
     @Test
     public void testGetNavDrawerDataQueueEmptyNoUnreadItems() {
-        final int NUM_FEEDS = 10;
-        final int NUM_ITEMS = 10;
-        DBTestUtils.saveFeedlist(NUM_FEEDS, NUM_ITEMS, true);
+        final int numFeeds = 10;
+        final int numItems = 10;
+        DbTestUtils.saveFeedlist(numFeeds, numItems, true);
         NavDrawerData navDrawerData = DBReader.getNavDrawerData();
-        assertEquals(NUM_FEEDS, navDrawerData.items.size());
+        assertEquals(numFeeds, navDrawerData.items.size());
         assertEquals(0, navDrawerData.numNewItems);
         assertEquals(0, navDrawerData.queueSize);
     }
@@ -354,9 +352,9 @@ public void testGetNavDrawerDataQueueNotEmptyWithUnreadItems() {
         adapter.close();
 
         NavDrawerData navDrawerData = DBReader.getNavDrawerData();
-        assertEquals(NUM_FEEDS, navDrawerData.items.size());
-        assertEquals(NUM_NEW, navDrawerData.numNewItems);
-        assertEquals(NUM_QUEUE, navDrawerData.queueSize);
+        assertEquals(numFeeds, navDrawerData.items.size());
+        assertEquals(numNew, navDrawerData.numNewItems);
+        assertEquals(numQueue, navDrawerData.queueSize);
     }
 
     @Test