Fix hardcoded company name

There was a problem that the company name specified in SDK configs on `init` was ignored even when no remote was loaded.
salemove · Aug 13, 2024 · bdbbd38 · bdbbd38
1 parent b4a7562
commit bdbbd38
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt b/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt
@@ -78,7 +78,7 @@ class CallActivityTest {
         Dependencies.setResourceProvider(resourceProvider)
 
         // set up StringProvider
-        val localeProvider = LocaleProvider(resourceProvider, sdkConfigurationManager.companyName)
+        val localeProvider = LocaleProvider(resourceProvider)
         Dependencies.setLocaleProvider(localeProvider)
 
         callStatus = mockk(relaxed = true)

diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.java b/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.java
@@ -64,7 +64,7 @@ public class Dependencies {
     public static void onAppCreate(Application application) {
         schedulers = new GliaWidgetsSchedulers();
         resourceProvider = new ResourceProvider(application.getBaseContext());
-        localeProvider = new LocaleProvider(resourceProvider, sdkConfigurationManager.getCompanyName());
+        localeProvider = new LocaleProvider(resourceProvider);
         notificationManager = new NotificationManager(application);
         DownloadsFolderDataSource downloadsFolderDataSource = new DownloadsFolderDataSource(application);
         repositoryFactory = new RepositoryFactory(gliaCore, downloadsFolderDataSource);
@@ -196,6 +196,7 @@ public static void init(@NonNull GliaWidgetsConfig gliaWidgetsConfig) {
         controllerFactory.init();
         repositoryFactory.getEngagementRepository().initialize();
         sdkConfigurationManager.fromConfiguration(gliaWidgetsConfig);
+        localeProvider.setCompanyName(gliaWidgetsConfig.companyName);
     }
 
     public static ControllerFactory getControllerFactory() {

diff --git a/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt b/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt
@@ -35,10 +35,10 @@ data class LocaleString(
 
 @OpenForTesting
 internal open class LocaleProvider @JvmOverloads constructor(
-    private val resourceProvider: IResourceProvider,
-    private val hardcodedCompanyName: String?
+    private val resourceProvider: IResourceProvider
 ) : StringProvider {
 
+    private var hardcodedCompanyName: String? = null
     private val regex = "(\\{[a-zA-Z\\d]*\\})".toRegex()
     private val localeObservable: Observable<String>
     private val localeEmitter: Observer<String>
@@ -114,6 +114,10 @@ internal open class LocaleProvider @JvmOverloads constructor(
         return localeObservable
     }
 
+    fun setCompanyName(companyName: String?) {
+        hardcodedCompanyName = companyName
+    }
+
     // Priority for remote company name but not found or no locales it will fall back to hardcoded one or "" if no hardcoded one
     fun getCompanyName(): String {
         var companyName = getStringInternal(R.string.general_company_name)

diff --git a/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt b/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt
@@ -43,6 +43,7 @@ class GliaWidgetsTest {
         Dependencies.setControllerFactory(controllerFactory)
         repositoryFactory = mock()
         Dependencies.setRepositoryFactory(repositoryFactory)
+        Dependencies.setLocaleProvider(mock())
     }
 
     @Test

diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotProviders.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotProviders.kt
@@ -11,7 +11,7 @@ internal interface SnapshotProviders: SnapshotContent, SnapshotTestLifecycle {
 
     fun localeProviderMock(): LocaleProvider {
         val resourceProvider = resourceProviderMock()
-        val localeProvider = object: LocaleProvider(resourceProvider, null) {
+        val localeProvider = object: LocaleProvider(resourceProvider) {
             override fun getStringInternal(stringKey: Int, values: List<StringKeyPair>): String {
                 return snapshotLocales[stringKey] ?: context.resources.getResourceName(stringKey).split("/")[1]
             }