From c7f05eee308646fcc99c9b5b077883e70af55671 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 4 Aug 2022 10:05:14 +0200
Subject: [PATCH 1/2] fix

---
 app/release/output-metadata.json              | 40 +++++++++----------
 .../fragments/SearchResultFragment.kt         |  8 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 5fdaa83f8..2dee107a4 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -16,23 +16,10 @@
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
+      "versionCode": 16,
+      "versionName": "0.4.2",
       "outputFile": "app-x86_64-release.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
-      "outputFile": "app-x86-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -42,10 +29,23 @@
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
+      "versionCode": 16,
+      "versionName": "0.4.2",
       "outputFile": "app-arm64-v8a-release.apk"
     },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 16,
+      "versionName": "0.4.2",
+      "outputFile": "app-x86-release.apk"
+    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -55,10 +55,10 @@
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
+      "versionCode": 16,
+      "versionName": "0.4.2",
       "outputFile": "app-armeabi-v7a-release.apk"
     }
   ],
   "elementType": "File"
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
index b8f4d78b1..4a6ea764f 100644
--- a/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
@@ -22,7 +22,7 @@ class SearchResultFragment : Fragment() {
     private val TAG = "SearchResultFragment"
     private lateinit var binding: FragmentSearchResultBinding
 
-    private lateinit var nextPage: String
+    private var nextPage: String? = null
     private var query: String = ""
 
     private lateinit var searchAdapter: SearchAdapter
@@ -71,7 +71,7 @@ class SearchResultFragment : Fragment() {
         binding.searchRecycler.viewTreeObserver
             .addOnScrollChangedListener {
                 if (!binding.searchRecycler.canScrollVertically(1)) {
-                    fetchNextSearchItems()
+                    if (nextPage != null) fetchNextSearchItems()
                 }
             }
     }
@@ -99,7 +99,7 @@ class SearchResultFragment : Fragment() {
                     binding.noSearchResult.visibility = View.VISIBLE
                 }
             }
-            nextPage = response.nextpage!!
+            nextPage = response.nextpage
         }
     }
 
@@ -109,7 +109,7 @@ class SearchResultFragment : Fragment() {
                 RetrofitInstance.api.getSearchResultsNextPage(
                     query,
                     apiSearchFilter,
-                    nextPage
+                    nextPage!!
                 )
             } catch (e: IOException) {
                 println(e)

From c61df6b6ba139315ec2b301ac6e9163f5a4cc41a Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 4 Aug 2022 10:17:24 +0200
Subject: [PATCH 2/2] cleanup

---
 .../main/java/com/github/libretube/services/BackgroundMode.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5c8c4c538..0431263e8 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -292,7 +292,7 @@ class BackgroundMode : Service() {
         // kill old notification
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
             as NotificationManager
-        notificationManager.cancel(1)
+        notificationManager.cancel(PLAYER_NOTIFICATION_ID)
     }
 
     override fun onBind(p0: Intent?): IBinder? {