Skip to content

Commit 91c67b0

Browse files
committed
Code improvements
Removed - partial - stupid code.
1 parent cd8c7ec commit 91c67b0

4 files changed

Lines changed: 13 additions & 31 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ public void onAttach(@NonNull final Context context) {
7979
}
8080
}
8181

82-
@Override
83-
public void onDetach() {
84-
super.onDetach();
85-
}
86-
8782
@Override
8883
public void onCreate(final Bundle savedInstanceState) {
8984
super.onCreate(savedInstanceState);

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,21 +183,17 @@ public void onCreateOptionsMenu(@NonNull final Menu menu,
183183
}
184184
}
185185

186-
private void openRssFeed() {
187-
final ChannelInfo info = currentInfo;
188-
if (info != null) {
189-
ShareUtils.openUrlInBrowser(requireContext(), info.getFeedUrl(), false);
190-
}
191-
}
192-
193186
@Override
194187
public boolean onOptionsItemSelected(final MenuItem item) {
195188
switch (item.getItemId()) {
196189
case R.id.action_settings:
197190
NavigationHelper.openSettings(requireContext());
198191
break;
199192
case R.id.menu_item_rss:
200-
openRssFeed();
193+
if (currentInfo != null) {
194+
ShareUtils.openUrlInBrowser(
195+
requireContext(), currentInfo.getFeedUrl(), false);
196+
}
201197
break;
202198
case R.id.menu_item_openInBrowser:
203199
if (currentInfo != null) {
@@ -516,12 +512,11 @@ private PlayQueue getPlayQueue() {
516512
}
517513

518514
private PlayQueue getPlayQueue(final int index) {
519-
final List<StreamInfoItem> streamItems = new ArrayList<>();
520-
for (final InfoItem i : infoListAdapter.getItemsList()) {
521-
if (i instanceof StreamInfoItem) {
522-
streamItems.add((StreamInfoItem) i);
523-
}
524-
}
515+
final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
516+
.filter(StreamInfoItem.class::isInstance)
517+
.map(StreamInfoItem.class::cast)
518+
.collect(Collectors.toList());
519+
525520
return new ChannelPlayQueue(currentInfo.getServiceId(), currentInfo.getUrl(),
526521
currentInfo.getNextPage(), streamItems, index);
527522
}

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ private Flowable<Integer> getUpdateProcessor(
413413
}
414414

415415
private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
416-
return new Subscriber<List<PlaylistRemoteEntity>>() {
416+
return new Subscriber<>() {
417417
@Override
418418
public void onSubscribe(final Subscription s) {
419419
if (bookmarkReactor != null) {

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
import java.io.Serializable;
2727

2828
import io.reactivex.rxjava3.core.Single;
29-
import io.reactivex.rxjava3.disposables.CompositeDisposable;
3029

3130
public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
3231
implements SharedPreferences.OnSharedPreferenceChangeListener {
3332
private static final String INFO_KEY = "related_info_key";
34-
private final CompositeDisposable disposables = new CompositeDisposable();
33+
3534
private RelatedItemInfo relatedItemInfo;
3635

3736
/*//////////////////////////////////////////////////////////////////////////
@@ -54,11 +53,6 @@ public RelatedItemsFragment() {
5453
// LifeCycle
5554
//////////////////////////////////////////////////////////////////////////*/
5655

57-
@Override
58-
public void onAttach(@NonNull final Context context) {
59-
super.onAttach(context);
60-
}
61-
6256
@Override
6357
public View onCreateView(@NonNull final LayoutInflater inflater,
6458
@Nullable final ViewGroup container,
@@ -67,9 +61,6 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
6761
}
6862

6963
@Override
70-
public void onDestroy() {
71-
super.onDestroy();
72-
disposables.clear();
7364
}
7465

7566
@Override
@@ -128,7 +119,6 @@ public void handleResult(@NonNull final RelatedItemInfo result) {
128119
}
129120
ViewUtils.slideUp(requireView(), 120, 96, 0.06f);
130121

131-
disposables.clear();
132122
}
133123

134124
/*//////////////////////////////////////////////////////////////////////////
@@ -137,11 +127,13 @@ public void handleResult(@NonNull final RelatedItemInfo result) {
137127

138128
@Override
139129
public void setTitle(final String title) {
130+
// Nothing to do - override parent
140131
}
141132

142133
@Override
143134
public void onCreateOptionsMenu(@NonNull final Menu menu,
144135
@NonNull final MenuInflater inflater) {
136+
// Nothing to do - override parent
145137
}
146138

147139
private void setInitialData(final StreamInfo info) {

0 commit comments

Comments
 (0)