kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 14:20:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3639 from Bnyro/master

Browse Source 
Fix various crashes caused by view bindings
This commit is contained in:
Bnyro 2023-04-27 09:05:53 +02:00 committed by GitHub
commit d7a8d9be71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
View File

@ -118,14 +118,16 @@ class ChannelFragment : Fragment() {
}
}
} catch (e: IOException) {
binding.channelRefresh.isRefreshing = false
_binding?.channelRefresh?.isRefreshing = false
Log.e(TAG(), "IOException, you might not have internet connection")
return@repeatOnLifecycle
} catch (e: HttpException) {
binding.channelRefresh.isRefreshing = false
_binding?.channelRefresh?.isRefreshing = false
Log.e(TAG(), "HttpException, unexpected response")
return@repeatOnLifecycle
}
val binding = _binding ?: return@repeatOnLifecycle
// needed if the channel gets loaded by the ID
channelId = response.id
channelName = response.name
@ -240,6 +242,7 @@ class ChannelFragment : Fragment() {
} catch (e: Exception) {
return@launch
}
val binding = _binding ?: return@launch
val adapter = SearchAdapter()
binding.channelRecView.adapter = adapter
@ -268,14 +271,16 @@ class ChannelFragment : Fragment() {
RetrofitInstance.api.getChannelNextPage(channelId!!, nextPage!!)
}
} catch (e: IOException) {
binding.channelRefresh.isRefreshing = false
_binding?.channelRefresh?.isRefreshing = false
Log.e(TAG(), "IOException, you might not have internet connection")
return@repeatOnLifecycle
} catch (e: HttpException) {
binding.channelRefresh.isRefreshing = false
_binding?.channelRefresh?.isRefreshing = false
Log.e(TAG(), "HttpException, unexpected response," + e.response())
return@repeatOnLifecycle
}
val binding = _binding ?: return@repeatOnLifecycle
nextPage = response.nextpage
channelAdapter?.insertItems(response.relatedStreams)
isLoading = false

2
app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
View File

@ -125,7 +125,7 @@ class LibraryFragment : Fragment() {
}
private fun fetchPlaylists() {
binding.playlistRefresh.isRefreshing = true
_binding?.playlistRefresh?.isRefreshing = true
lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.CREATED) {
var playlists = try {

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

@ -110,6 +110,10 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.upstream.DefaultDataSource
import com.google.android.exoplayer2.util.MimeTypes
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import java.io.IOException
import java.util.*
import java.util.concurrent.Executors
import kotlin.math.abs
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@ -118,10 +122,6 @@ import kotlinx.coroutines.withContext
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import retrofit2.HttpException
import java.io.IOException
import java.util.*
import java.util.concurrent.Executors
import kotlin.math.abs
class PlayerFragment : Fragment(), OnlinePlayerOptions {
private var _binding: FragmentPlayerBinding? = null

2
app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
View File

@ -121,6 +121,8 @@ class PlaylistFragment : Fragment() {
Log.e(TAG(), e.toString())
return@repeatOnLifecycle
}
val binding = _binding ?: return@repeatOnLifecycle
playlistFeed = response.relatedStreams.toMutableList()
binding.playlistScrollview.visibility = View.VISIBLE
nextPage = response.nextpage

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

@ -104,6 +104,8 @@ class SearchResultFragment : Fragment() {
Log.e(TAG(), "HttpException, unexpected response")
return@repeatOnLifecycle
}
val binding = _binding ?: return@repeatOnLifecycle
searchAdapter = SearchAdapter()
binding.searchRecycler.adapter = searchAdapter
searchAdapter.submitList(response.items)