Add support for databases operated with coroutines.(#19)

dora4 · Dec 13, 2024 · 6d3a76f · 6d3a76f
1 parent 3076f2a
commit 6d3a76f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/dcache/build.gradle.kts b/dcache/build.gradle.kts
@@ -51,7 +51,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.dora4"
                 artifactId = "dcache-android"
-                version = "3.1.3"
+                version = "3.1.4"
             }
         }
     }

diff --git a/dcache/src/main/java/dora/cache/repository/BaseFlowRepository.kt b/dcache/src/main/java/dora/cache/repository/BaseFlowRepository.kt
@@ -325,6 +325,10 @@ abstract class BaseFlowRepository<M, F : CacheHolderFactory<M>>(val context: Con
         return connectivityManager.activeNetworkInfo
     }
 
+    protected open fun getModelType() : Class<M> {
+        return getGenericType(this) as Class<M>
+    }
+
     private fun getGenericType(obj: Any): Class<*> {
         return if (obj.javaClass.genericSuperclass is ParameterizedType &&
                 (obj.javaClass.genericSuperclass as ParameterizedType).actualTypeArguments.isNotEmpty()) {
@@ -350,7 +354,7 @@ abstract class BaseFlowRepository<M, F : CacheHolderFactory<M>>(val context: Con
         } else {
             isLogPrint = repository.isLogPrint
         }
-        MClass = getGenericType(this) as Class<M>
+        MClass = getModelType()
         Log.d(TAG, "MClass:$MClass,isListMode:$isListMode")
         cacheHolderFactory = createCacheHolderFactory()
         // 二选一实现CacheHolder和DataFetcher并使用

diff --git a/dcache/src/main/java/dora/cache/repository/BaseRepository.kt b/dcache/src/main/java/dora/cache/repository/BaseRepository.kt
@@ -321,6 +321,10 @@ abstract class BaseRepository<M, F : CacheHolderFactory<M>>(val context: Context
         return connectivityManager.activeNetworkInfo
     }
 
+    protected open fun getModelType() : Class<M> {
+        return getGenericType(this) as Class<M>
+    }
+
     private fun getGenericType(obj: Any): Class<*> {
         return if (obj.javaClass.genericSuperclass is ParameterizedType &&
                 (obj.javaClass.genericSuperclass as ParameterizedType).actualTypeArguments.isNotEmpty()) {
@@ -346,7 +350,7 @@ abstract class BaseRepository<M, F : CacheHolderFactory<M>>(val context: Context
         } else {
             isLogPrint = repository.isLogPrint
         }
-        MClass = getGenericType(this) as Class<M>
+        MClass = getModelType()
         Log.d(TAG, "MClass:$MClass,isListMode:$isListMode")
         cacheHolderFactory = createCacheHolderFactory()
         // Implement either CacheHolder or DataFetcher and use it.