Merge pull request #13036 from dustdfg/kotlin_misc_refactor

Misc small kotlin based refactors

Author: theimpulson

app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt

@@ -22,7 +22,6 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo
 import org.schabi.newpipe.extractor.stream.StreamType
 import java.io.IOException
 import java.time.OffsetDateTime
-import kotlin.streams.toList
 
 class FeedDAOTest {
     private lateinit var db: AppDatabase

app/src/main/java/org/schabi/newpipe/DownloaderImpl.java

@@ -161,9 +161,7 @@ public Response execute(@NonNull final Request request)
 
             String responseBodyToReturn = null;
             try (ResponseBody body = response.body()) {
-                if (body != null) {
-                    responseBodyToReturn = body.string();
-                }
+                responseBodyToReturn = body.string();
             }
 
             final String latestUrl = response.request().url().toString();

app/src/main/java/org/schabi/newpipe/database/Migrations.kt

@@ -8,7 +8,6 @@ package org.schabi.newpipe.database
 
 import android.util.Log
 import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
 import org.schabi.newpipe.MainActivity
 
 object Migrations {

app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt

@@ -163,7 +163,7 @@ class ErrorInfo private constructor(
         private fun getServiceName(serviceId: Int?) =
             // not using getNameOfServiceById since we want to accept a nullable serviceId and we
             // want to default to SERVICE_NONE
-            ServiceList.all()?.firstOrNull { it.serviceId == serviceId }?.serviceInfo?.name
+            ServiceList.all().firstOrNull { it.serviceId == serviceId }?.serviceInfo?.name
                 ?: SERVICE_NONE
 
         fun throwableToStringList(throwable: Throwable) = arrayOf(throwable.stackTraceToString())

app/src/main/java/org/schabi/newpipe/ktx/View.kt

@@ -41,11 +41,7 @@ fun View.animate(
     execOnEnd: Runnable? = null
 ) {
     if (DEBUG) {
-        val id = try {
-            resources.getResourceEntryName(id)
-        } catch (e: Exception) {
-            id.toString()
-        }
+        val id = runCatching { resources.getResourceEntryName(id) }.getOrDefault(id.toString())
         val msg = String.format(
             "%8s →  [%s:%s] [%s %s:%s] execOnEnd=%s", enterOrExit,
             javaClass.simpleName, id, animationType, duration, delay, execOnEnd

app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt

@@ -85,14 +85,13 @@ class FeedDatabaseManager(context: Context) {
         items: List<StreamInfoItem>,
         oldestAllowedDate: OffsetDateTime = FEED_OLDEST_ALLOWED_DATE
     ) {
-        val itemsToInsert = ArrayList<StreamInfoItem>()
-        loop@ for (streamItem in items) {
-            val uploadDate = streamItem.uploadDate
-
-            itemsToInsert += when {
-                uploadDate == null && streamItem.streamType == StreamType.LIVE_STREAM -> streamItem
-                uploadDate != null && uploadDate.offsetDateTime() >= oldestAllowedDate -> streamItem
-                else -> continue@loop
+        val itemsToInsert = items.mapNotNull { stream ->
+            val uploadDate = stream.uploadDate
+
+            when {
+                uploadDate == null && stream.streamType == StreamType.LIVE_STREAM -> stream
+                uploadDate != null && uploadDate.offsetDateTime() >= oldestAllowedDate -> stream
+                else -> null
             }
         }
 

app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt

@@ -15,6 +15,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
+import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
@@ -181,8 +182,7 @@ class NotificationHelper(val context: Context) {
                 val manager = context.getSystemService<NotificationManager>()!!
                 val enabled = manager.areNotificationsEnabled()
                 val channel = manager.getNotificationChannel(channelId)
-                val importance = channel?.importance
-                enabled && channel != null && importance != NotificationManager.IMPORTANCE_NONE
+                enabled && channel?.importance != NotificationManager.IMPORTANCE_NONE
             } else {
                 NotificationManagerCompat.from(context).areNotificationsEnabled()
             }
@@ -212,7 +212,7 @@ class NotificationHelper(val context: Context) {
                 context.startActivity(intent)
             } else {
                 val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                intent.data = Uri.parse("package:" + context.packageName)
+                intent.data = "package:${context.packageName}".toUri()
                 context.startActivity(intent)
             }
         }

app/src/main/java/org/schabi/newpipe/local/feed/notifications/ScheduleOptions.kt

@@ -3,6 +3,7 @@ package org.schabi.newpipe.local.feed.notifications
 import android.content.Context
 import androidx.preference.PreferenceManager
 import org.schabi.newpipe.R
+import org.schabi.newpipe.ktx.getStringSafe
 import java.util.concurrent.TimeUnit
 
 /**
@@ -20,11 +21,9 @@ data class ScheduleOptions(
             val preferences = PreferenceManager.getDefaultSharedPreferences(context)
             return ScheduleOptions(
                 interval = TimeUnit.SECONDS.toMillis(
-                    preferences.getString(
+                    preferences.getStringSafe(
                         context.getString(R.string.streams_notifications_interval_key),
-                        null
-                    )?.toLongOrNull() ?: context.getString(
-                        R.string.streams_notifications_interval_default
+                        context.getString(R.string.streams_notifications_interval_default)
                     ).toLong()
                 ),
                 isRequireNonMeteredNetwork = preferences.getString(

app/src/main/java/org/schabi/newpipe/local/playlist/ExportPlaylist.kt

@@ -65,5 +65,5 @@ private val linkHandler: YoutubeStreamLinkHandlerFactory = YoutubeStreamLinkHand
  */
 private fun getYouTubeId(url: String): String? {
 
-    return try { linkHandler.getId(url) } catch (e: ParsingException) { null }
+    return runCatching { linkHandler.getId(url) }.getOrNull()
 }