Inject base URL in the server enum class

Change-Id: Ifb8f670b580762094be78575c4ea22d637665976
tommynok · Feb 11, 2023 · cfac3ff · cfac3ff
1 parent de4dc89
commit cfac3ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/core/model/src/main/java/com/merxury/blocker/core/model/preference/RuleServerProvider.kt b/core/model/src/main/java/com/merxury/blocker/core/model/preference/RuleServerProvider.kt
@@ -19,7 +19,7 @@ package com.merxury.blocker.core.model.preference
 /**
  * Model representation for the online data provider
  */
-enum class RuleServerProvider {
-    GITHUB,
-    GITLAB,
+enum class RuleServerProvider(val baseUrl: String) {
+    GITHUB("https://raw.githubusercontent.com/lihenggui/blocker-general-rules/online/"),
+    GITLAB("https://jihulab.com/mercuryli/blocker-general-rules/-/raw/online/"),
 }
diff --git a/core/network/src/main/java/com/merxury/blocker/core/network/di/NetworkModule.kt b/core/network/src/main/java/com/merxury/blocker/core/network/di/NetworkModule.kt
@@ -18,6 +18,7 @@
 package com.merxury.blocker.core.network.di
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.merxury.blocker.core.model.preference.RuleServerProvider
 import com.merxury.blocker.core.network.BlockerNetworkDataSource
 import com.merxury.blocker.core.network.model.GitHub
 import com.merxury.blocker.core.network.model.GitLab
@@ -27,21 +28,17 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object NetworkModule {
-    private const val GITHUB_URL =
-        "https://raw.githubusercontent.com/lihenggui/blocker-general-rules/online/"
-    private const val GITLAB_URL =
-        "https://jihulab.com/mercuryli/blocker-general-rules/-/raw/online/"
 
     @Provides
     @Singleton
@@ -63,14 +60,14 @@ object NetworkModule {
     @GitHub
     fun provideGitHubNetworkApi(
         networkJson: Json,
-    ): BlockerNetworkApi = provideBlockerNetworkApi(networkJson, GITHUB_URL)
+    ): BlockerNetworkApi = provideBlockerNetworkApi(networkJson, RuleServerProvider.GITHUB.baseUrl)
 
     @Singleton
     @Provides
     @GitLab
     fun provideGitLabNetworkApi(
         networkJson: Json,
-    ): BlockerNetworkApi = provideBlockerNetworkApi(networkJson, GITLAB_URL)
+    ): BlockerNetworkApi = provideBlockerNetworkApi(networkJson, RuleServerProvider.GITLAB.baseUrl)
 
     private fun provideBlockerNetworkApi(networkJson: Json, url: String): BlockerNetworkApi {
         return Retrofit.Builder()