Merge pull request #8 from jxareas/bugfix/video-fragment-crash-on-unk…

…nown-host-exception Fix App Crash on UnknownHostException
jxareas · Dec 13, 2022 · 46b528d · 46b528d
2 parents c02d569 + bd9dd8d
commit 46b528d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -112,12 +112,12 @@ dependencies {
     implementation(Dependencies.Navigation.NAVIGATION_UI)
 
     // OkHttp
-    implementation(Dependencies.Network.OKHTTP_CLIENT)
-    implementation(Dependencies.Network.LOGGING_INTERCEPTOR)
+    implementation(Dependencies.Square.OKHTTP_CLIENT)
+    implementation(Dependencies.Square.LOGGING_INTERCEPTOR)
 
     // Retrofit
-    implementation(Dependencies.Network.RETROFIT)
-    implementation(Dependencies.Network.MOSHI_CONVERTER)
+    implementation(Dependencies.Square.RETROFIT)
+    implementation(Dependencies.Square.MOSHI_CONVERTER)
 
     // Dagger Hilt
     implementation(Dependencies.Dagger.HILT)
@@ -130,8 +130,8 @@ dependencies {
     implementation(Dependencies.Android.SPLASH_SCREEN)
 
     // Shimmer
-    implementation(Dependencies.Shimmer.SHIMMER)
+    implementation(Dependencies.Facebook.SHIMMER)
 
     // Moshi
-    implementation(Dependencies.Moshi.MOSHI)
+    implementation(Dependencies.Square.MOSHI)
 }
diff --git a/...ain/kotlin/com/jxareas/goalie/features/videos/data/repository/VideoClipsRepositoryImpl.kt b/...ain/kotlin/com/jxareas/goalie/features/videos/data/repository/VideoClipsRepositoryImpl.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import retrofit2.HttpException
+import java.io.IOException
 import javax.inject.Inject
 
 class VideoClipsRepositoryImpl @Inject constructor(
@@ -29,7 +30,7 @@ class VideoClipsRepositoryImpl @Inject constructor(
             } ?: run {
                 throw HttpException(response)
             }
-        } catch (networkException: HttpException) {
+        } catch (networkException: IOException) {
             emit(NetworkResult.Error(networkException))
         }
     }.buffer()

diff --git a/app/src/main/kotlin/com/jxareas/goalie/features/videos/presentation/ui/VideoClipsFragment.kt b/app/src/main/kotlin/com/jxareas/goalie/features/videos/presentation/ui/VideoClipsFragment.kt
@@ -40,7 +40,7 @@ class VideoClipsFragment : Fragment() {
     private val binding: FragmentVideoClipsBinding
         get() = _binding!!
 
-    private val viewModel: VideosViewModel by viewModels()
+    private val viewModel: VideoClipsViewModel by viewModels()
 
     private val videoClipsListAdapter = VideoClipsAdapter { videoDto ->
         handleVideoClick(videoDto)

diff --git a/...videos/presentation/ui/VideosViewModel.kt → ...os/presentation/ui/VideoClipsViewModel.kt b/...videos/presentation/ui/VideosViewModel.kt → ...os/presentation/ui/VideoClipsViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @HiltViewModel
-class VideosViewModel @Inject constructor(
+class VideoClipsViewModel @Inject constructor(
     private val repository: VideoClipsRepository
 ) : ViewModel() {
 

diff --git a/buildSrc/src/main/kotlin/com/jxareas/goalie/Dependencies.kt b/buildSrc/src/main/kotlin/com/jxareas/goalie/Dependencies.kt
@@ -82,7 +82,7 @@ object Dependencies {
             "org.jetbrains.kotlin:kotlin-serialization:$KOTLIN_SERIALIZATION_VERSION"
     }
 
-    object Network {
+    object Square {
         private const val OKHTTP_VERSION = "4.10.0"
         const val OKHTTP_CLIENT = "com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"
         const val LOGGING_INTERCEPTOR = "com.squareup.okhttp3:logging-interceptor:$OKHTTP_VERSION"
@@ -91,15 +91,12 @@ object Dependencies {
         const val RETROFIT = "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
         const val MOSHI_CONVERTER =
             "com.squareup.retrofit2:converter-moshi:$RETROFIT_VERSION"
-    }
 
-    object Moshi {
         private const val MOSHI_VERSION = "1.13.0"
         const val MOSHI = "com.squareup.moshi:moshi-kotlin:$MOSHI_VERSION"
-
     }
 
-    object Shimmer {
+    object Facebook {
         private const val SHIMMER_VERSION = "0.5.0"
 
         const val SHIMMER = "com.facebook.shimmer:shimmer:$SHIMMER_VERSION"