fix: resolve conflict

Author: RawanMatar89

core/src/main/java/org/openedx/core/config/Config.kt

@@ -8,13 +8,15 @@ import com.google.gson.JsonParser
 import org.openedx.core.domain.model.AgreementUrls
 import java.io.InputStreamReader
 
+@Suppress("TooManyFunctions")
 class Config(context: Context) {
 
     private var configProperties: JsonObject = try {
         val inputStream = context.assets.open("config/config.json")
-        val config = Gson().fromJson(InputStreamReader(inputStream), JsonObject::class.java)
+        val config = JsonParser.parseReader(InputStreamReader(inputStream))
         config.asJsonObject
     } catch (e: Exception) {
+        e.printStackTrace()
         JsonObject()
     }
 
@@ -26,10 +28,6 @@ class Config(context: Context) {
         return getString(API_HOST_URL)
     }
 
-    fun getSSOURL(): String {
-        return getString(SSO_URL, "")
-    }
-
     fun getUriScheme(): String {
         return getString(URI_SCHEME)
     }
@@ -94,10 +92,6 @@ class Config(context: Context) {
         return getObjectOrNewInstance(DASHBOARD, DashboardConfig::class.java)
     }
 
-    fun getDownloadsConfig(): AppLevelDownloadsConfig {
-        return getExperimentalFeaturesConfig().appLevelDownloadsConfig
-    }
-
     fun getBranchConfig(): BranchConfig {
         return getObjectOrNewInstance(BRANCH, BranchConfig::class.java)
     }
@@ -114,37 +108,16 @@ class Config(context: Context) {
         return getObjectOrNewInstance(UI_COMPONENTS, UIConfig::class.java)
     }
 
-    fun isBrowserLoginEnabled(): Boolean {
-        return getBoolean(BROWSER_LOGIN, false)
-    }
-
-    fun isBrowserRegistrationEnabled(): Boolean {
-        return getBoolean(BROWSER_REGISTRATION, false)
-    }
-
-    private fun getExperimentalFeaturesConfig(): ExperimentalFeaturesConfig {
-        return getObjectOrNewInstance(EXPERIMENTAL_FEATURES, ExperimentalFeaturesConfig::class.java)
-    }
-
     fun isRegistrationEnabled(): Boolean {
         return getBoolean(REGISTRATION_ENABLED, true)
     }
 
-    fun isLoginRegistrationEnabled(): Boolean {
-        return getBoolean(LOGIN_REGISTRATION_ENABLED, true)
-    }
-
-    fun isSSOLoginEnabled(): Boolean {
-        return getBoolean(SAML_SSO_LOGIN_ENABLED, false)
-    }
-
-    fun isSSODefaultLoginButton(): Boolean {
-        return getBoolean(SAML_SSO_DEFAULT_LOGIN_BUTTON, false)
+    fun isBrowserLoginEnabled(): Boolean {
+        return getBoolean(BROWSER_LOGIN, false)
     }
 
-    fun getSSOButtonTitle(key: String, defaultValue: String): String{
-        val element = getObject(SSO_BUTTON_TITLE)
-        return element?.asJsonObject?.get(key)?.asString ?: defaultValue
+    fun isBrowserRegistrationEnabled(): Boolean {
+        return getBoolean(BROWSER_REGISTRATION, false)
     }
 
     private fun getString(key: String, defaultValue: String = ""): String {
@@ -170,26 +143,22 @@ class Config(context: Context) {
             try {
                 cls.getDeclaredConstructor().newInstance()
             } catch (e: InstantiationException) {
-                throw RuntimeException(e)
+                throw ConfigParsingException(e)
             } catch (e: IllegalAccessException) {
-                throw RuntimeException(e)
+                throw ConfigParsingException(e)
             }
         }
     }
 
+    class ConfigParsingException(cause: Throwable) : Exception(cause)
+
     private fun getObject(key: String): JsonElement? {
         return configProperties.get(key)
     }
 
     companion object {
         private const val APPLICATION_ID = "APPLICATION_ID"
         private const val API_HOST_URL = "API_HOST_URL"
-        private const val SSO_URL = "SSO_URL"
-        private const val SSO_FINISHED_URL = "SSO_FINISHED_URL"
-        private const val SSO_BUTTON_TITLE = "SSO_BUTTON_TITLE"
-        private const val SAML_SSO_LOGIN_ENABLED = "SAML_SSO_LOGIN_ENABLED"
-        private const val SAML_SSO_DEFAULT_LOGIN_BUTTON = "SAML_SSO_DEFAULT_LOGIN_BUTTON"
-        private const val LOGIN_REGISTRATION_ENABLED = "LOGIN_REGISTRATION_ENABLED"
         private const val URI_SCHEME = "URI_SCHEME"
         private const val OAUTH_CLIENT_ID = "OAUTH_CLIENT_ID"
         private const val TOKEN_TYPE = "TOKEN_TYPE"
@@ -204,13 +173,12 @@ class Config(context: Context) {
         private const val GOOGLE = "GOOGLE"
         private const val MICROSOFT = "MICROSOFT"
         private const val PRE_LOGIN_EXPERIENCE_ENABLED = "PRE_LOGIN_EXPERIENCE_ENABLED"
+        private const val REGISTRATION_ENABLED = "REGISTRATION_ENABLED"
         private const val BROWSER_LOGIN = "BROWSER_LOGIN"
         private const val BROWSER_REGISTRATION = "BROWSER_REGISTRATION"
-        private const val REGISTRATION_ENABLED = "REGISTRATION_ENABLED"
         private const val DISCOVERY = "DISCOVERY"
         private const val PROGRAM = "PROGRAM"
         private const val DASHBOARD = "DASHBOARD"
-        private const val EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES"
         private const val BRANCH = "BRANCH"
         private const val UI_COMPONENTS = "UI_COMPONENTS"
         private const val PLATFORM_NAME = "PLATFORM_NAME"
@@ -220,4 +188,4 @@ class Config(context: Context) {
         NATIVE,
         WEBVIEW
     }
-}
+}