Merge pull request #4543 from ByteHamster/fixes

Fixes for CI failures introduced in recent PRs

app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java

@@ -48,6 +48,7 @@ import io.reactivex.schedulers.Schedulers;
 import org.apache.commons.lang3.StringUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.List;
 
@@ -236,18 +237,18 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
         startActivity(intent);
     }
 
-    @Subscribe
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onUnreadItemsChanged(UnreadItemsUpdateEvent event) {
         loadData();
     }
 
 
-    @Subscribe
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onFeedListChanged(FeedListUpdateEvent event) {
         loadData();
     }
 
-    @Subscribe
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onQueueChanged(QueueEvent event) {
         Log.d(TAG, "onQueueChanged(" + event + ")");
         // we are only interested in the number of queue items, not download status or position

app/src/main/res/xml/preferences_user_interface.xml

@@ -35,7 +35,7 @@
             android:defaultValue="1"/>
         <Preference
             android:title="@string/pref_filter_feed_title"
-            android:key="prefFeedFilter"
+            android:key="prefSubscriptionsFilter"
             android:summary="@string/pref_filter_feed_sum" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/external_elements">