kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 15:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #965 from Bnyro/master

Browse Source 
fixes
This commit is contained in:
Bnyro 2022-08-04 10:17:57 +02:00 committed by GitHub
commit 02f0bb5dd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/release/output-metadata.json
View File

@ -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"
}
}

8
app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
View File

@ -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)

2
app/src/main/java/com/github/libretube/services/BackgroundMode.kt
View File

@ -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? {