From ad9f975b5fd719b340d75195eb324cb1e1a87380 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sat, 17 Sep 2022 15:57:24 +0530
Subject: [PATCH 1/2] Use NotificationChannelCompat.

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../libretube/{MyApp.kt => LibreTubeApp.kt}   | 68 +++++++------------
 app/src/main/res/values/strings.xml           |  8 +++
 3 files changed, 32 insertions(+), 46 deletions(-)
 rename app/src/main/java/com/github/libretube/{MyApp.kt => LibreTubeApp.kt} (53%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2d5fd716..4491ea9e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:name=".MyApp"
+        android:name=".LibreTubeApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/github/libretube/MyApp.kt b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
similarity index 53%
rename from app/src/main/java/com/github/libretube/MyApp.kt
rename to app/src/main/java/com/github/libretube/LibreTubeApp.kt
index 12f01bb64..795eb8024 100644
--- a/app/src/main/java/com/github/libretube/MyApp.kt
+++ b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
@@ -1,12 +1,10 @@
 package com.github.libretube
 
-import android.annotation.SuppressLint
 import android.app.Application
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.os.Build
 import android.os.StrictMode
 import android.os.StrictMode.VmPolicy
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.api.RetrofitInstance
@@ -19,12 +17,12 @@ import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NotificationHelper
 import com.github.libretube.util.PreferenceHelper
 
-class MyApp : Application() {
+class LibreTubeApp : Application() {
     override fun onCreate() {
         super.onCreate()
 
         /**
-         * Initialize the needed [NotificationChannel]s for DownloadService and BackgroundMode
+         * Initialize the needed notification channels for DownloadService and BackgroundMode
          */
         initializeNotificationChannels()
 
@@ -67,47 +65,27 @@ class MyApp : Application() {
     }
 
     /**
-     * Initializes the required [NotificationChannel]s for the app.
+     * Initializes the required notification channels for the app.
      */
-    @SuppressLint("InlinedApi")
     private fun initializeNotificationChannels() {
-        createNotificationChannel(
-            DOWNLOAD_CHANNEL_ID,
-            "Download Service",
-            "Shows a notification when downloading media.",
-            NotificationManager.IMPORTANCE_NONE
-        )
-        createNotificationChannel(
-            BACKGROUND_CHANNEL_ID,
-            "Background Mode",
-            "Shows a notification with buttons to control the audio player",
-            NotificationManager.IMPORTANCE_LOW
-        )
-        createNotificationChannel(
-            PUSH_CHANNEL_ID,
-            "Notification Worker",
-            "Shows a notification when new streams are available.",
-            NotificationManager.IMPORTANCE_DEFAULT
-        )
-    }
+        val downloadChannel = NotificationChannelCompat.Builder(DOWNLOAD_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_NONE)
+            .setName(getString(R.string.download_channel_name))
+            .setDescription(getString(R.string.download_channel_description))
+            .build()
+        val backgroundChannel = NotificationChannelCompat.Builder(BACKGROUND_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_LOW)
+            .setName(getString(R.string.background_channel_name))
+            .setDescription(getString(R.string.background_channel_description))
+            .build()
+        val pushChannel = NotificationChannelCompat.Builder(PUSH_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_DEFAULT)
+            .setName(getString(R.string.push_channel_name))
+            .setDescription(getString(R.string.push_channel_description))
+            .build()
 
-    /**
-     * Creates a [NotificationChannel]
-     */
-    private fun createNotificationChannel(
-        id: String,
-        name: String,
-        descriptionText: String,
-        importance: Int
-    ) {
-        // Create the NotificationChannel, but only on API 26+ because
-        // the NotificationChannel class is new and not in the support library
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(id, name, importance)
-            channel.description = descriptionText
-            // Register the channel in the system
-            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-            notificationManager.createNotificationChannel(channel)
-        }
+        val notificationManager = NotificationManagerCompat.from(this)
+        notificationManager.createNotificationChannelsCompat(listOf(downloadChannel,
+            backgroundChannel, pushChannel))
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62009f659..10d021479 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -324,4 +324,12 @@
     <string name="skip_segment">Skip segment</string>
     <string name="sb_skip_manual">Skip manually</string>
     <string name="sb_skip_manual_summary">Don\'t skip segments automatically, always prompt before.</string>
+
+    <!-- Notification channel strings -->
+    <string name="download_channel_name">Download Service</string>
+    <string name="download_channel_description">Shows a notification when downloading media.</string>
+    <string name="background_channel_name">Background Mode</string>
+    <string name="background_channel_description">Shows a notification with buttons to control the audio player.</string>
+    <string name="push_channel_name">Notification Worker</string>
+    <string name="push_channel_description">Shows a notification when new streams are available.</string>
 </resources>

From b867df053bcd55b37f96c2305d78209cd0f32d4a Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 18 Sep 2022 10:44:37 +0200
Subject: [PATCH 2/2] fix linter

---
 .../java/com/github/libretube/LibreTubeApp.kt | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/LibreTubeApp.kt b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
index 795eb8024..281de0cec 100644
--- a/app/src/main/java/com/github/libretube/LibreTubeApp.kt
+++ b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
@@ -68,24 +68,35 @@ class LibreTubeApp : Application() {
      * Initializes the required notification channels for the app.
      */
     private fun initializeNotificationChannels() {
-        val downloadChannel = NotificationChannelCompat.Builder(DOWNLOAD_CHANNEL_ID,
-            NotificationManagerCompat.IMPORTANCE_NONE)
+        val downloadChannel = NotificationChannelCompat.Builder(
+            DOWNLOAD_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_NONE
+        )
             .setName(getString(R.string.download_channel_name))
             .setDescription(getString(R.string.download_channel_description))
             .build()
-        val backgroundChannel = NotificationChannelCompat.Builder(BACKGROUND_CHANNEL_ID,
-            NotificationManagerCompat.IMPORTANCE_LOW)
+        val backgroundChannel = NotificationChannelCompat.Builder(
+            BACKGROUND_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_LOW
+        )
             .setName(getString(R.string.background_channel_name))
             .setDescription(getString(R.string.background_channel_description))
             .build()
-        val pushChannel = NotificationChannelCompat.Builder(PUSH_CHANNEL_ID,
-            NotificationManagerCompat.IMPORTANCE_DEFAULT)
+        val pushChannel = NotificationChannelCompat.Builder(
+            PUSH_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_DEFAULT
+        )
             .setName(getString(R.string.push_channel_name))
             .setDescription(getString(R.string.push_channel_description))
             .build()
 
         val notificationManager = NotificationManagerCompat.from(this)
-        notificationManager.createNotificationChannelsCompat(listOf(downloadChannel,
-            backgroundChannel, pushChannel))
+        notificationManager.createNotificationChannelsCompat(
+            listOf(
+                downloadChannel,
+                backgroundChannel,
+                pushChannel
+            )
+        )
     }
 }