Merge pull request #13137 from dustdfg/info_item_builder_dead

Remove dead code from info_list/InfoItemBuilder

app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt

@@ -92,7 +92,7 @@ class AboutActivity : AppCompatActivity() {
             return when (position) {
                 posAbout -> AboutFragment()
                 posLicense -> LicenseFragment.newInstance(SOFTWARE_COMPONENTS)
-                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
+                else -> error("Unknown position for ViewPager2")
             }
         }
 
@@ -105,7 +105,7 @@ class AboutActivity : AppCompatActivity() {
             return when (position) {
                 posAbout -> R.string.tab_about
                 posLicense -> R.string.tab_licenses
-                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
+                else -> error("Unknown position for ViewPager2")
             }
         }
     }

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt

@@ -87,7 +87,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
 
     private fun compareAndUpdateStream(newerStream: StreamEntity) {
         val existentMinimalStream = getMinimalStreamForCompare(newerStream.serviceId, newerStream.url)
-            ?: throw IllegalStateException("Stream cannot be null just after insertion.")
+            ?: error("Stream cannot be null just after insertion.")
         newerStream.uid = existentMinimalStream.uid
 
         if (!StreamTypeUtil.isLiveStream(newerStream.streamType)) {

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.kt

@@ -100,7 +100,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
                 entity.uid = uidFromInsert
             } else {
                 val subscriptionIdFromDb = getSubscriptionIdInternal(entity.serviceId, entity.url!!)
-                    ?: throw IllegalStateException("Subscription cannot be null just after insertion.")
+                    ?: error("Subscription cannot be null just after insertion.")
                 entity.uid = subscriptionIdFromDb
 
                 update(entity)

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java

@@ -1,131 +0,0 @@
-package org.schabi.newpipe.info_list;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
-import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.InfoItemHolder;
-import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.OnClickGesture;
-
-/*
- * Created by Christian Schabesberger on 26.09.16.
- * <p>
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * InfoItemBuilder.java is part of NewPipe.
- * </p>
- * <p>
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * </p>
- * <p>
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
-public class InfoItemBuilder {
-    private final Context context;
-
-    private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
-    private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
-    private OnClickGesture<PlaylistInfoItem> onPlaylistSelectedListener;
-    private OnClickGesture<CommentsInfoItem> onCommentsSelectedListener;
-
-    public InfoItemBuilder(final Context context) {
-        this.context = context;
-    }
-
-    public View buildView(@NonNull final ViewGroup parent, @NonNull final InfoItem infoItem,
-                          final HistoryRecordManager historyRecordManager) {
-        return buildView(parent, infoItem, historyRecordManager, false);
-    }
-
-    public View buildView(@NonNull final ViewGroup parent, @NonNull final InfoItem infoItem,
-                          final HistoryRecordManager historyRecordManager,
-                          final boolean useMiniVariant) {
-        final InfoItemHolder holder =
-                holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
-        holder.updateFromItem(infoItem, historyRecordManager);
-        return holder.itemView;
-    }
-
-    private InfoItemHolder holderFromInfoType(@NonNull final ViewGroup parent,
-                                              @NonNull final InfoItem.InfoType infoType,
-                                              final boolean useMiniVariant) {
-        switch (infoType) {
-            case STREAM:
-                return useMiniVariant ? new StreamMiniInfoItemHolder(this, parent)
-                        : new StreamInfoItemHolder(this, parent);
-            case CHANNEL:
-                return useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent)
-                        : new ChannelInfoItemHolder(this, parent);
-            case PLAYLIST:
-                return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent)
-                        : new PlaylistInfoItemHolder(this, parent);
-            case COMMENT:
-                return new CommentInfoItemHolder(this, parent);
-            default:
-                throw new RuntimeException("InfoType not expected = " + infoType.name());
-        }
-    }
-
-    public Context getContext() {
-        return context;
-    }
-
-    public OnClickGesture<StreamInfoItem> getOnStreamSelectedListener() {
-        return onStreamSelectedListener;
-    }
-
-    public void setOnStreamSelectedListener(final OnClickGesture<StreamInfoItem> listener) {
-        this.onStreamSelectedListener = listener;
-    }
-
-    public OnClickGesture<ChannelInfoItem> getOnChannelSelectedListener() {
-        return onChannelSelectedListener;
-    }
-
-    public void setOnChannelSelectedListener(final OnClickGesture<ChannelInfoItem> listener) {
-        this.onChannelSelectedListener = listener;
-    }
-
-    public OnClickGesture<PlaylistInfoItem> getOnPlaylistSelectedListener() {
-        return onPlaylistSelectedListener;
-    }
-
-    public void setOnPlaylistSelectedListener(final OnClickGesture<PlaylistInfoItem> listener) {
-        this.onPlaylistSelectedListener = listener;
-    }
-
-    public OnClickGesture<CommentsInfoItem> getOnCommentsSelectedListener() {
-        return onCommentsSelectedListener;
-    }
-
-    public void setOnCommentsSelectedListener(
-            final OnClickGesture<CommentsInfoItem> onCommentsSelectedListener) {
-        this.onCommentsSelectedListener = onCommentsSelectedListener;
-    }
-}

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.kt

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2016-2026 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package org.schabi.newpipe.info_list
+
+import android.content.Context
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem
+import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem
+import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import org.schabi.newpipe.util.OnClickGesture
+
+class InfoItemBuilder(val context: Context) {
+    var onStreamSelectedListener: OnClickGesture<StreamInfoItem>? = null
+    var onChannelSelectedListener: OnClickGesture<ChannelInfoItem>? = null
+    var onPlaylistSelectedListener: OnClickGesture<PlaylistInfoItem>? = null
+    var onCommentsSelectedListener: OnClickGesture<CommentsInfoItem>? = null
+}

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserCommon.kt

@@ -22,7 +22,7 @@ internal fun infoItemTypeToString(type: InfoType): String {
         InfoType.STREAM -> ID_STREAM
         InfoType.PLAYLIST -> ID_PLAYLIST
         InfoType.CHANNEL -> ID_CHANNEL
-        else -> throw IllegalStateException("Unexpected value: $type")
+        else -> error("Unexpected value: $type")
     }
 }
 
@@ -31,7 +31,7 @@ internal fun infoItemTypeFromString(type: String): InfoType {
         ID_STREAM -> InfoType.STREAM
         ID_PLAYLIST -> InfoType.PLAYLIST
         ID_CHANNEL -> InfoType.CHANNEL
-        else -> throw IllegalStateException("Unexpected value: $type")
+        else -> error("Unexpected value: $type")
     }
 }
 

app/src/main/java/org/schabi/newpipe/player/mediabrowser/PackageValidator.kt

@@ -82,11 +82,11 @@ internal class PackageValidator(context: Context) {
 
         // Build the caller info for the rest of the checks here.
         val callerPackageInfo = buildCallerInfo(callingPackage)
-            ?: throw IllegalStateException("Caller wasn't found in the system?")
+            ?: error("Caller wasn't found in the system?")
 
         // Verify that things aren't ... broken. (This test should always pass.)
-        if (callerPackageInfo.uid != callingUid) {
-            throw IllegalStateException("Caller's package UID doesn't match caller's actual UID?")
+        check(callerPackageInfo.uid != callingUid) {
+            "Caller's package UID doesn't match caller's actual UID?"
         }
 
         val callerSignature = callerPackageInfo.signature
@@ -202,7 +202,7 @@ internal class PackageValidator(context: Context) {
      */
     private fun getSystemSignature(): String = getPackageInfo(ANDROID_PLATFORM)?.let { platformInfo ->
         getSignature(platformInfo)
-    } ?: throw IllegalStateException("Platform signature not found")
+    } ?: error("Platform signature not found")
 
     /**
      * Creates a SHA-256 signature given a certificate byte array.

app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java

@@ -9,8 +9,9 @@ import com.grack.nanojson.JsonParserException;
 import com.grack.nanojson.JsonStringWriter;
 import com.grack.nanojson.JsonWriter;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Class to get a JSON representation of a list of tabs, and the other way around.
@@ -44,39 +45,25 @@ public final class TabsJsonHelper {
             return getDefaultTabs();
         }
 
-        final List<Tab> returnTabs = new ArrayList<>();
-
-        final JsonObject outerJsonObject;
         try {
-            outerJsonObject = JsonParser.object().from(tabsJson);
+            final JsonObject outerJsonObject = JsonParser.object().from(tabsJson);
 
             if (!outerJsonObject.has(JSON_TABS_ARRAY_KEY)) {
                 throw new InvalidJsonException("JSON doesn't contain \"" + JSON_TABS_ARRAY_KEY
                         + "\" array");
             }
 
-            final JsonArray tabsArray = outerJsonObject.getArray(JSON_TABS_ARRAY_KEY);
+            final JsonArray tabsArray = outerJsonObject.getArray(JSON_TABS_ARRAY_KEY, null);
 
-            for (final Object o : tabsArray) {
-                if (!(o instanceof JsonObject)) {
-                    continue;
-                }
+            final var returnTabs = tabsArray.streamAsJsonObjects()
+                    .map(Tab::from)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toUnmodifiableList());
 
-                final Tab tab = Tab.from((JsonObject) o);
-
-                if (tab != null) {
-                    returnTabs.add(tab);
-                }
-            }
+            return returnTabs.isEmpty() ? getDefaultTabs() : returnTabs;
         } catch (final JsonParserException e) {
             throw new InvalidJsonException(e);
         }
-
-        if (returnTabs.isEmpty()) {
-            return getDefaultTabs();
-        }
-
-        return returnTabs;
     }
 
     /**