- Updated field declaration

openMF · May 9, 2024 · b23437b · b23437b
1 parent bc221fd
commit b23437b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -8,14 +8,6 @@ plugins {
     id(libs.plugins.kotlin.kapt.get().pluginId)
 }
 
-val protocol = project.properties["PROTOCOL_HTTPS"].toString()
-val apiEndpoint = project.properties["API_ENDPOINT"].toString()
-val apiPath = project.properties["API_PATH"].toString()
-val port = project.properties["PORT"].toString()
-val tenant = project.properties["TENANT"].toString()
-
-val serverConfig = "$protocol,$apiEndpoint,$apiPath,$port,$tenant"
-
 android {
     namespace = "com.mifos.core.network"
     compileSdk = 34
@@ -25,8 +17,6 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
-
-        buildConfigField("String", "SERVER_CONFIG", "\"$serverConfig\"")
     }
 
     buildTypes {

diff --git a/core/network/src/main/java/com/mifos/core/network/BaseUrl.kt b/core/network/src/main/java/com/mifos/core/network/BaseUrl.kt
@@ -11,7 +11,7 @@ class BaseUrl {
 
     // "/" in the last of the base url always
     companion object {
-        private val configs = BuildConfig.SERVER_CONFIG.split(",")
+        private val configs = BuildConfig.DEMO_SERVER_CONFIG.split(",")
 
          val PROTOCOL_HTTPS = configs[0]
          val API_ENDPOINT = configs[1]

diff --git a/secrets.defaults.properties b/secrets.defaults.properties
@@ -1,30 +1,16 @@
 
-# Default values for the Mifos API
-# You can override these values by creating secrets.properties file in the root directory of the project
+## Update DEMO_SERVER_CONFIG according below mentioned your server config
 
-PROTOCOL_HTTPS = https://
+# PROTOCOL_HTTPS=https://
+# API_ENDPOINT=demo.mifos.community
+# API_PATH=/fineract-provider/api/v1/
+# PORT=80
+# TENANT=default
 
-API_ENDPOINT = demo.mifos.community
+# Separated By Comma (,) Without Space like below
+# PROTOCOL_HTTPS,API_ENDPOINT,API_PATH,PORT,TENANT
 
-API_PATH = /fineract-provider/api/v1/
-
-PORT = 80
-
-TENANT = default
+DEMO_SERVER_CONFIG="https://,demo.mifos.community,/fineract-provider/api/v1/,80,default"
 
 # Provide GEO API Key
-GEO_API_KEY = AIzaSyAZTZqvDGyyw21z2Ee7N-dE_WuZQwKL0bs
-
-DEMO_SERVER_CONFIG = "https://,demo.mifos.community,/fineract-provider/api/v1/,80,default"
-
-#SERVER_CONFIG = "${PROTOCOL_HTTPS}"
-#
-#SERVER_CONFIGs = '${PROTOCOL_HTTPS}'
-#
-#SERVER_CONFIGt = '\PROTOCOL_HTTPS\'
-#
-#SERVER_CONFIGD = \${PROTOCOL_HTTPS}
-#
-#SERVER_CONFIGe = $PROTOCOL_HTTPS
-
-#SERVER_CONFIGf = "\"{$PROTOCOL_HTTPS}\""
+GEO_API_KEY=AIzaSyAZTZqvDGyyw21z2Ee7N-dE_WuZQwKL0