From 93ceef71cc1e8e02a6cac5d353c8de396361e3d9 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 8 Sep 2022 18:41:57 +0200
Subject: [PATCH] fix errors and warnings

---
 app/release/output-metadata.json              | 42 +++++++++----------
 .../libretube/activities/AboutActivity.kt     | 12 +++---
 .../libretube/activities/CommunityActivity.kt | 10 ++---
 .../github/libretube/constants/Constants.kt   |  2 +-
 .../com/github/libretube/db/DatabaseHolder.kt |  2 +-
 .../github/libretube/dialogs/ShareDialog.kt   |  4 +-
 .../libretube/dialogs/VideoOptionsDialog.kt   |  2 +-
 .../libretube/services/BackgroundMode.kt      |  4 +-
 .../libretube/services/ClosingService.kt      |  2 +-
 .../libretube/services/DownloadService.kt     | 20 +++++----
 .../github/libretube/update/UpdateChecker.kt  |  4 +-
 .../libretube/util/NotificationHelper.kt      |  4 +-
 .../libretube/util/NowPlayingNotification.kt  |  4 +-
 13 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 07499f0c2..e288a7878 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,23 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
+      "versionCode": 18,
+      "versionName": "0.5.1",
       "outputFile": "app-universal-release.apk"
     },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 18,
+      "versionName": "0.5.1",
+      "outputFile": "app-x86_64-release.apk"
+    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -24,8 +37,8 @@
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
+      "versionCode": 18,
+      "versionName": "0.5.1",
       "outputFile": "app-armeabi-v7a-release.apk"
     },
     {
@@ -37,8 +50,8 @@
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
+      "versionCode": 18,
+      "versionName": "0.5.1",
       "outputFile": "app-x86-release.apk"
     },
     {
@@ -50,22 +63,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
+      "versionCode": 18,
+      "versionName": "0.5.1",
       "outputFile": "app-arm64-v8a-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86_64"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
-      "outputFile": "app-x86_64-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/app/src/main/java/com/github/libretube/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/activities/AboutActivity.kt
index f2e7a514d..f88bb349f 100644
--- a/app/src/main/java/com/github/libretube/activities/AboutActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/AboutActivity.kt
@@ -8,13 +8,13 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Html
-import com.github.libretube.DONATE_URL
-import com.github.libretube.GITHUB_URL
-import com.github.libretube.LICENSE_URL
-import com.github.libretube.PIPED_GITHUB_URL
+import com.github.libretube.constants.DONATE_URL
+import com.github.libretube.constants.GITHUB_URL
+import com.github.libretube.constants.LICENSE_URL
+import com.github.libretube.constants.PIPED_GITHUB_URL
 import com.github.libretube.R
-import com.github.libretube.WEBLATE_URL
-import com.github.libretube.WEBSITE_URL
+import com.github.libretube.constants.WEBLATE_URL
+import com.github.libretube.constants.WEBSITE_URL
 import com.github.libretube.databinding.ActivityAboutBinding
 import com.github.libretube.extensions.BaseActivity
 import com.github.libretube.extensions.getStyledSnackBar
diff --git a/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt b/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt
index 7fe9f2211..d4d1f57e0 100644
--- a/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt
@@ -3,11 +3,11 @@ package com.github.libretube.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.github.libretube.DISCORD_URL
-import com.github.libretube.MATRIX_URL
-import com.github.libretube.REDDIT_URL
-import com.github.libretube.TELEGRAM_URL
-import com.github.libretube.TWITTER_URL
+import com.github.libretube.constants.DISCORD_URL
+import com.github.libretube.constants.MATRIX_URL
+import com.github.libretube.constants.REDDIT_URL
+import com.github.libretube.constants.TELEGRAM_URL
+import com.github.libretube.constants.TWITTER_URL
 import com.github.libretube.databinding.ActivityCommunityBinding
 import com.github.libretube.extensions.BaseActivity
 
diff --git a/app/src/main/java/com/github/libretube/constants/Constants.kt b/app/src/main/java/com/github/libretube/constants/Constants.kt
index 9cb03468f..51dde19c2 100644
--- a/app/src/main/java/com/github/libretube/constants/Constants.kt
+++ b/app/src/main/java/com/github/libretube/constants/Constants.kt
@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.constants
 
 /**
  * API link for the update checker
diff --git a/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt b/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt
index 2d92fdbcc..16e47e1f3 100644
--- a/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt
+++ b/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt
@@ -2,7 +2,7 @@ package com.github.libretube.db
 
 import android.content.Context
 import androidx.room.Room
-import com.github.libretube.DATABASE_NAME
+import com.github.libretube.constants.DATABASE_NAME
 
 object DatabaseHolder {
     lateinit var db: AppDatabase
diff --git a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
index 032343b9b..7db97517f 100644
--- a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
@@ -4,9 +4,9 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import com.github.libretube.PIPED_FRONTEND_URL
+import com.github.libretube.constants.PIPED_FRONTEND_URL
 import com.github.libretube.R
-import com.github.libretube.YOUTUBE_FRONTEND_URL
+import com.github.libretube.constants.YOUTUBE_FRONTEND_URL
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.DialogShareBinding
 import com.github.libretube.db.DatabaseHolder
diff --git a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
index 4b8700b5a..f0f65cc7c 100644
--- a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.Globals
-import com.github.libretube.PLAYER_NOTIFICATION_ID
+import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
 import com.github.libretube.R
 import com.github.libretube.util.BackgroundHelper
 import com.github.libretube.util.PreferenceHelper
diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
index 330b3c53d..da49f3295 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -11,9 +11,9 @@ import android.os.IBinder
 import android.os.Looper
 import android.widget.Toast
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.github.libretube.BACKGROUND_CHANNEL_ID
+import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.Globals
-import com.github.libretube.PLAYER_NOTIFICATION_ID
+import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
diff --git a/app/src/main/java/com/github/libretube/services/ClosingService.kt b/app/src/main/java/com/github/libretube/services/ClosingService.kt
index 20382b94a..ad3f48a14 100644
--- a/app/src/main/java/com/github/libretube/services/ClosingService.kt
+++ b/app/src/main/java/com/github/libretube/services/ClosingService.kt
@@ -6,7 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import androidx.annotation.Nullable
-import com.github.libretube.PLAYER_NOTIFICATION_ID
+import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
 
 class ClosingService : Service() {
 
diff --git a/app/src/main/java/com/github/libretube/services/DownloadService.kt b/app/src/main/java/com/github/libretube/services/DownloadService.kt
index b405a7bb6..55d4933d7 100644
--- a/app/src/main/java/com/github/libretube/services/DownloadService.kt
+++ b/app/src/main/java/com/github/libretube/services/DownloadService.kt
@@ -17,10 +17,10 @@ import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.github.libretube.DOWNLOAD_CHANNEL_ID
-import com.github.libretube.DOWNLOAD_FAILURE_NOTIFICATION_ID
-import com.github.libretube.DOWNLOAD_PENDING_NOTIFICATION_ID
-import com.github.libretube.DOWNLOAD_SUCCESS_NOTIFICATION_ID
+import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
+import com.github.libretube.constants.DOWNLOAD_FAILURE_NOTIFICATION_ID
+import com.github.libretube.constants.DOWNLOAD_PENDING_NOTIFICATION_ID
+import com.github.libretube.constants.DOWNLOAD_SUCCESS_NOTIFICATION_ID
 import com.github.libretube.Globals
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
@@ -180,8 +180,7 @@ class DownloadService : Service() {
     }
 
     private fun downloadNotification(intent: Intent) {
-        var pendingIntent: PendingIntent? = null
-        pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE)
         } else {
             PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT)
@@ -234,7 +233,14 @@ class DownloadService : Service() {
 
         Globals.IS_DOWNLOAD_RUNNING = false
         Log.d(TAG(), "dl finished!")
-        stopForeground(true)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            @Suppress("DEPRECATION")
+            stopForeground(true)
+        }
+
         stopService(Intent(this@DownloadService, DownloadService::class.java))
         super.onDestroy()
     }
diff --git a/app/src/main/java/com/github/libretube/update/UpdateChecker.kt b/app/src/main/java/com/github/libretube/update/UpdateChecker.kt
index a2246d7d9..693a50d15 100644
--- a/app/src/main/java/com/github/libretube/update/UpdateChecker.kt
+++ b/app/src/main/java/com/github/libretube/update/UpdateChecker.kt
@@ -1,7 +1,7 @@
 package com.github.libretube.update
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.github.libretube.GITHUB_API_URL
+import com.github.libretube.constants.GITHUB_API_URL
 import com.github.libretube.extensions.await
 import java.net.URL
 
@@ -9,7 +9,7 @@ object UpdateChecker {
     fun getLatestReleaseInfo(): UpdateInfo? {
         var versionInfo: UpdateInfo? = null
         // run http request as thread to make it async
-        val thread = Thread {
+        Thread {
             // otherwise crashes without internet
             versionInfo = getUpdateInfo()
             try {
diff --git a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
index 100e84b18..1d26770a7 100644
--- a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
@@ -11,8 +11,8 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
-import com.github.libretube.NOTIFICATION_WORK_NAME
-import com.github.libretube.PUSH_CHANNEL_ID
+import com.github.libretube.constants.NOTIFICATION_WORK_NAME
+import com.github.libretube.constants.PUSH_CHANNEL_ID
 import com.github.libretube.R
 import com.github.libretube.activities.MainActivity
 import com.github.libretube.api.RetrofitInstance
diff --git a/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt b/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
index 8b9ea2a5e..84180bd2b 100644
--- a/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
+++ b/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
@@ -7,8 +7,8 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.support.v4.media.session.MediaSessionCompat
-import com.github.libretube.BACKGROUND_CHANNEL_ID
-import com.github.libretube.PLAYER_NOTIFICATION_ID
+import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
+import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
 import com.github.libretube.activities.MainActivity
 import com.github.libretube.extensions.await
 import com.github.libretube.obj.Streams