Merge pull request #9162 from nextcloud/dependabot/gradle/androidx.lifecycle-lifecycle-viewmodel-ktx-2.4.0

Bump lifecycle-viewmodel-ktx from 2.3.1 to 2.4.0

build.gradle

@@ -260,7 +260,7 @@ dependencies {
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
     implementation "androidx.work:work-runtime:$workRuntime"
     implementation "androidx.work:work-runtime-ktx:$workRuntime"
     implementation "androidx.fragment:fragment-ktx:1.4.0"

src/main/java/com/nextcloud/client/di/ViewModelFactory.kt

@@ -37,8 +37,8 @@ class ViewModelFactory @Inject constructor(
     private val viewModelProviders: Map<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
 ) : ViewModelProvider.Factory {
 
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-        var vmProvider: Provider<ViewModel>? = viewModelProviders.get(modelClass)
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        var vmProvider: Provider<ViewModel>? = viewModelProviders[modelClass]
 
         if (vmProvider == null) {
             for (entry in viewModelProviders.entries) {
@@ -53,12 +53,7 @@ class ViewModelFactory @Inject constructor(
             throw IllegalArgumentException("${modelClass.simpleName} view model class is not supported")
         }
 
-        @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown", "UNCHECKED_CAST")
-        try {
-            val vm = vmProvider.get() as T
-            return vm
-        } catch (e: Exception) {
-            throw RuntimeException(e)
-        }
+        @Suppress("UNCHECKED_CAST")
+        return vmProvider.get() as T
     }
 }