Code improvements

Removed - partial - stupid code.
This commit is contained in:
litetex 2022-01-15 23:55:19 +01:00
parent cd8c7ec3c0
commit 91c67b085b
4 changed files with 13 additions and 31 deletions

View file

@ -79,11 +79,6 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
} }
} }
@Override
public void onDetach() {
super.onDetach();
}
@Override @Override
public void onCreate(final Bundle savedInstanceState) { public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

View file

@ -183,13 +183,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
} }
} }
private void openRssFeed() {
final ChannelInfo info = currentInfo;
if (info != null) {
ShareUtils.openUrlInBrowser(requireContext(), info.getFeedUrl(), false);
}
}
@Override @Override
public boolean onOptionsItemSelected(final MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
@ -197,7 +190,10 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
NavigationHelper.openSettings(requireContext()); NavigationHelper.openSettings(requireContext());
break; break;
case R.id.menu_item_rss: case R.id.menu_item_rss:
openRssFeed(); if (currentInfo != null) {
ShareUtils.openUrlInBrowser(
requireContext(), currentInfo.getFeedUrl(), false);
}
break; break;
case R.id.menu_item_openInBrowser: case R.id.menu_item_openInBrowser:
if (currentInfo != null) { if (currentInfo != null) {
@ -516,12 +512,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
} }
private PlayQueue getPlayQueue(final int index) { private PlayQueue getPlayQueue(final int index) {
final List<StreamInfoItem> streamItems = new ArrayList<>(); final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
for (final InfoItem i : infoListAdapter.getItemsList()) { .filter(StreamInfoItem.class::isInstance)
if (i instanceof StreamInfoItem) { .map(StreamInfoItem.class::cast)
streamItems.add((StreamInfoItem) i); .collect(Collectors.toList());
}
}
return new ChannelPlayQueue(currentInfo.getServiceId(), currentInfo.getUrl(), return new ChannelPlayQueue(currentInfo.getServiceId(), currentInfo.getUrl(),
currentInfo.getNextPage(), streamItems, index); currentInfo.getNextPage(), streamItems, index);
} }

View file

@ -413,7 +413,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
} }
private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() { private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
return new Subscriber<List<PlaylistRemoteEntity>>() { return new Subscriber<>() {
@Override @Override
public void onSubscribe(final Subscription s) { public void onSubscribe(final Subscription s) {
if (bookmarkReactor != null) { if (bookmarkReactor != null) {

View file

@ -26,12 +26,11 @@ import org.schabi.newpipe.util.RelatedItemInfo;
import java.io.Serializable; import java.io.Serializable;
import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo> public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
implements SharedPreferences.OnSharedPreferenceChangeListener { implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String INFO_KEY = "related_info_key"; private static final String INFO_KEY = "related_info_key";
private final CompositeDisposable disposables = new CompositeDisposable();
private RelatedItemInfo relatedItemInfo; private RelatedItemInfo relatedItemInfo;
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
@ -54,11 +53,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
// LifeCycle // LifeCycle
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
@Override
public void onAttach(@NonNull final Context context) {
super.onAttach(context);
}
@Override @Override
public View onCreateView(@NonNull final LayoutInflater inflater, public View onCreateView(@NonNull final LayoutInflater inflater,
@Nullable final ViewGroup container, @Nullable final ViewGroup container,
@ -67,9 +61,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
} }
@Override @Override
public void onDestroy() {
super.onDestroy();
disposables.clear();
} }
@Override @Override
@ -128,7 +119,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
} }
ViewUtils.slideUp(requireView(), 120, 96, 0.06f); ViewUtils.slideUp(requireView(), 120, 96, 0.06f);
disposables.clear();
} }
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
@ -137,11 +127,13 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
@Override @Override
public void setTitle(final String title) { public void setTitle(final String title) {
// Nothing to do - override parent
} }
@Override @Override
public void onCreateOptionsMenu(@NonNull final Menu menu, public void onCreateOptionsMenu(@NonNull final Menu menu,
@NonNull final MenuInflater inflater) { @NonNull final MenuInflater inflater) {
// Nothing to do - override parent
} }
private void setInitialData(final StreamInfo info) { private void setInitialData(final StreamInfo info) {