From f0b86c18a8ded80c6d381d6d28dcf16479af4b14 Mon Sep 17 00:00:00 2001
From: Herbert Reiter <46045854+damoasda@users.noreply.github.com>
Date: Thu, 21 Jan 2021 11:39:16 +0100
Subject: Fix ClassCastException in FeedItemlistFragment (#4857)

---
 .../java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java    | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/fragment')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 550e4761e..583d49afb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.content.Intent;
 import android.graphics.LightingColorFilter;
@@ -17,7 +16,6 @@ import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
@@ -452,10 +450,6 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
         if (feed.getItemFilter() != null) {
             FeedItemFilter filter = feed.getItemFilter();
             if (filter.getValues().length > 0) {
-                if (feed.hasLastUpdateFailed()) {
-                    RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) txtvInformation.getLayoutParams();
-                    p.addRule(RelativeLayout.BELOW, R.id.txtvFailure);
-                }
                 txtvInformation.setText("{md-info-outline} " + this.getString(R.string.filtered_label));
                 Iconify.addIcons(txtvInformation);
                 txtvInformation.setOnClickListener((l) -> {
-- 
cgit v1.2.3


From 931bda4bedac1540c9bf3f78cd2b8dd897edf52d Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 4 Feb 2021 12:36:23 +0100
Subject: Fixed local folder name being set to null

---
 .../main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/fragment')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index 28456c01e..09dfac37a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -190,7 +190,11 @@ public class AddFeedFragment extends Fragment {
         if (documentFile == null) {
             throw new IllegalArgumentException("Unable to retrieve document tree");
         }
-        Feed dirFeed = new Feed(Feed.PREFIX_LOCAL_FOLDER + uri.toString(), null, documentFile.getName());
+        String title = documentFile.getName();
+        if (title == null) {
+            title = getString(R.string.local_folder);
+        }
+        Feed dirFeed = new Feed(Feed.PREFIX_LOCAL_FOLDER + uri.toString(), null, title);
         dirFeed.setItems(Collections.emptyList());
         dirFeed.setSortOrder(SortOrder.EPISODE_TITLE_A_Z);
         Feed fromDatabase = DBTasks.updateFeed(getContext(), dirFeed, false);
-- 
cgit v1.2.3