浏览代码

ViewModelFactory: fix compile errors for viewmodel-ktx changes

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 年之前
父节点
当前提交
14fbc2ab78
共有 1 个文件被更改,包括 4 次插入9 次删除
  1. 4 9
      src/main/java/com/nextcloud/client/di/ViewModelFactory.kt

+ 4 - 9
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
     }
 }