Fix reflection error

openmobilehub · May 30, 2023 · 382ccbb · 382ccbb
1 parent da0c722
commit 382ccbb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -42,5 +42,5 @@ object Libs {
     val coroutineTesting by lazy { "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}" }
 
     // Auth
-    val omhAuthLibrary by lazy { "com.openmobilehub.android:auth-api:${Versions.omhAuth}" }
+    val omhAuthLibrary by lazy { "com.openmobilehub.android:auth-api-non-gms:${Versions.omhAuth}" }
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -34,5 +34,5 @@ object Versions {
     const val mockk = "1.13.4"
 
     // Auth
-    const val omhAuth = "1.0.1"
+    const val omhAuth = "1.0"
 }
diff --git a/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageProvider.kt b/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageProvider.kt
@@ -2,15 +2,20 @@ package com.omh.android.storage.api
 
 import com.omh.android.auth.api.OmhAuthClient
 import kotlin.reflect.KClass
+import kotlin.reflect.full.createInstance
 
 object OmhStorageProvider {
 
     private const val NGMS_ADDRESS = "com.omh.android.storage.api.drive.nongms.OmhStorageFactoryImpl"
 
-    @SuppressWarnings("SwallowedException")
+    @SuppressWarnings("ThrowingExceptionsWithoutMessageOrCause")
     fun provideStorageClient(authClient: OmhAuthClient): OmhStorageClient {
-        val clazz: KClass<out Any> = Class.forName(NGMS_ADDRESS).kotlin
-        val omhStorageFactory = clazz.objectInstance as OmhStorageFactory
-        return omhStorageFactory.getStorageClient(authClient)
+        val clazz: Class<*> = Class.forName(NGMS_ADDRESS)
+        val kClass: KClass<*> = clazz.kotlin
+        val instance: Any = kClass.createInstance()
+
+        val storageFactory = instance as? OmhStorageFactory ?: throw NullPointerException()
+
+        return storageFactory.getStorageClient(authClient)
     }
 }
diff --git a/storage-sample/src/main/java/com/omh/android/storage/sample/splash/ActivitySplash.kt b/storage-sample/src/main/java/com/omh/android/storage/sample/splash/ActivitySplash.kt
@@ -20,7 +20,8 @@ class ActivitySplash : AppCompatActivity() {
     @Inject
     lateinit var omhAuthClient: OmhAuthClient
 
-    // @Inject lateinit var omhStorageClient: OmhStorageClient
+    @Inject
+    lateinit var omhStorageClient: OmhStorageClient
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)