fix: address feedback

openedx · Nov 5, 2024 · a060146 · a060146
1 parent fd7c721
commit a060146
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/OpenEdX/Managers/PluginManager.swift b/OpenEdX/Managers/PluginManager.swift
@@ -6,10 +6,7 @@
 //
 
 import Foundation
-import Core
 import OEXFoundation
-import OEXFirebaseAnalytics
-import Swinject
 
 public class PluginManager {
 

diff --git a/OpenEdX/Managers/PushNotificationsManager/Providers/FCMProvider.swift b/OpenEdX/Managers/PushNotificationsManager/Providers/FCMProvider.swift
@@ -8,7 +8,6 @@
 import Foundation
 import Core
 import OEXFoundation
-import OEXFirebaseAnalytics
 import FirebaseCore
 import FirebaseMessaging
 

diff --git a/OpenEdX/Managers/PushNotificationsManager/PushNotificationsManager.swift b/OpenEdX/Managers/PushNotificationsManager/PushNotificationsManager.swift
@@ -10,7 +10,6 @@ import Core
 import OEXFoundation
 import UIKit
 import UserNotifications
-import OEXFirebaseAnalytics
 import FirebaseCore
 import FirebaseMessaging
 

diff --git a/config_script/whitelabel.py b/config_script/whitelabel.py
@@ -561,6 +561,18 @@ def set_flags_from_mobile_config(self):
                 with open(self.config_project_path, 'r') as openfile:
                     project_file_string = openfile.read()
                 errors_texts = []
+                # iterate for all configurations
+                for name, config in configurations.items():
+                    if 'env_config' in config:
+                        # get folder name for mobile config for current configuration by env_config
+                        config_folder = config_settings.get(self.CONFIG_MAPPINGS, {}).get(config['env_config'])
+                        if config_folder:
+                            # example of usage
+                            # project_file_string = self.replace_fullstory_flag(project_file_string, config_directory, name, config_folder, errors_texts)
+                        else:
+                            logging.error("Config folder for '"+config['env_config']+"' is not defined in config_settings.yaml->config_mapping")
+                    else:
+                        logging.error("'env_config' is not defined for "+name)
                 # write to project file
                 with open(self.config_project_path, 'w') as openfile:
                     openfile.write(project_file_string)
@@ -575,6 +587,20 @@ def set_flags_from_mobile_config(self):
         else:
             logging.error("Mobile config directory not found")
 
+#    def replace_fullstory_flag(self, project_file_string, config_directory, config_name,  config_folder, errors_texts):
+#        # get mobile config
+#        mobile_config = self.get_mobile_config(config_directory,  config_folder, errors_texts)
+#        if mobile_config:
+#            # get FULLSTORY settings from mobile config
+#            fullstory_config = mobile_config.get('FULLSTORY', {})
+#            if fullstory_config:
+#                fullstory_config_enabled = fullstory_config.get('ENABLED')
+#                fullstory_string = "FULLSTORY_ENABLED = YES;" if fullstory_config_enabled else "FULLSTORY_ENABLED = NO;"
+#                fullstory_regex = "FULLSTORY_ENABLED = .*;"
+#                # serach by regex and replace
+#                project_file_string = self.replace_parameter_for_build_config(project_file_string, config_name, fullstory_string, fullstory_regex, errors_texts)
+#        return project_file_string
+#
 def main():
     """
     Parse the command line arguments, and pass them to WhitelabelApp.