From 09bad517fcd03183824e93eebfb6d013027cd788 Mon Sep 17 00:00:00 2001 From: Domingos Lopes Date: Tue, 22 Mar 2016 12:11:23 -0400 Subject: further fixes based on mfietz input --- .../main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java | 2 +- .../main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java | 1 - .../java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java | 5 +++-- .../danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java | 4 ++-- .../java/de/danoeh/antennapod/preferences/PreferenceController.java | 2 +- .../main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java | 1 - .../antennapod/core/service/playback/PlaybackServiceMediaPlayer.java | 5 ----- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java index df9fce6d2..37e00ab74 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java @@ -109,7 +109,7 @@ public class ChaptersListAdapter extends ArrayAdapter { if (link.length != 0) { if (action == MotionEvent.ACTION_UP) { link[0].onClick(widget); - } else { + } else if (action == MotionEvent.ACTION_DOWN){ Selection.setSelection(buffer, buffer.getSpanStart(link[0]), buffer.getSpanEnd(link[0])); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java index f2f8921bb..4faa7be2d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -401,7 +401,6 @@ public class ItemlistFragment extends ListFragment { public void onEventMainThread(FeedItemEvent event) { Log.d(TAG, "onEventMainThread() called with: " + "event = [" + event + "]"); -// boolean queueChanged = false; if(feed == null || feed.getItems() == null || adapter == null) { return; } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java index 977c015b1..b736688b9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java @@ -81,8 +81,9 @@ public class ItunesSearchFragment extends Fragment { if (result != null && result.size() > 0) { gridView.setVisibility(View.VISIBLE); txtvEmpty.setVisibility(View.GONE); - - adapter.addAll(result); + for (Podcast p : result) { + adapter.add(p); + } adapter.notifyDataSetInvalidated(); } else { gridView.setVisibility(View.GONE); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java index 46e062f1f..1b1b61efb 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java @@ -1,6 +1,6 @@ package de.danoeh.antennapod.fragment.gpodnet; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import de.danoeh.antennapod.core.gpoddernet.GpodnetService; @@ -20,7 +20,7 @@ public class SuggestionListFragment extends PodcastListFragment { service.authenticate(GpodnetPreferences.getUsername(), GpodnetPreferences.getPassword()); return service.getSuggestions(SUGGESTIONS_COUNT); } else { - return new ArrayList<>(); + return Collections.emptyList(); } } } diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 6a85f7341..9dad49145 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -627,7 +627,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc Preference.OnPreferenceClickListener clickListener = preference -> { if (preference instanceof CheckBoxPreference) { String key = preference.getKey(); - ArrayList prefValuesList = new ArrayList<>( + List prefValuesList = new ArrayList<>( Arrays.asList(UserPreferences .getAutodownloadSelectedNetworks()) ); diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java index 5c09a2302..513264a05 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java @@ -106,7 +106,6 @@ public class ApOkHttpUrlLoader implements ModelLoader { public Response intercept(Chain chain) throws IOException { com.squareup.okhttp.Request request = chain.request(); String url = request.urlString(); - // Context context = ClientConfig.applicationCallbacks.getApplicationInstance(); String authentication = DBReader.getImageAuthentication(url); if(TextUtils.isEmpty(authentication)) { diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java index 0101feba9..15a96588c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java @@ -255,11 +255,6 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre } setPlayerStatus(PlayerStatus.INITIALIZED, media); -// if (mediaType == MediaType.VIDEO) { -// VideoPlayer vp = (VideoPlayer) mediaPlayer; -// // vp.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT); -// } - if (prepareImmediately) { setPlayerStatus(PlayerStatus.PREPARING, media); mediaPlayer.prepare(); -- cgit v1.2.3