From dedfb9394f92918dada19002128eee4e8a537326 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Fri, 8 Sep 2023 14:34:59 +0300
Subject: [PATCH] Enable RUST_BACKTRACE by default

---
 .../xcshareddata/xcschemes/ElementX.xcscheme              | 5 -----
 ElementX/Sources/Application/AppCoordinator.swift         | 8 +++++++-
 ElementX/SupportingFiles/target.yml                       | 3 ---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
index 47395d07c7..8f195fc8ee 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
@@ -82,11 +82,6 @@
       <CommandLineArguments>
       </CommandLineArguments>
       <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "RUST_BACKTRACE"
-            value = "full"
-            isEnabled = "NO">
-         </EnvironmentVariable>
          <EnvironmentVariable
             key = "HTTPS_PROXY"
             value = "localhost:9090"
diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift
index 9a868dd014..1301734ed6 100644
--- a/ElementX/Sources/Application/AppCoordinator.swift
+++ b/ElementX/Sources/Application/AppCoordinator.swift
@@ -58,6 +58,8 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate,
     @Consumable private var storedAppRoute: AppRoute?
 
     init() {
+        Self.setupEnvironmentVariables()
+        
         let appSettings = AppSettings()
         
         if appSettings.otlpTracingEnabled {
@@ -77,7 +79,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate,
         navigationRootCoordinator = NavigationRootCoordinator()
         
         Self.setupServiceLocator(navigationRootCoordinator: navigationRootCoordinator, appSettings: appSettings)
-
+        
         ServiceLocator.shared.analytics.startIfEnabled()
 
         stateMachine = AppCoordinatorStateMachine()
@@ -230,6 +232,10 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate,
     
     // MARK: - Private
     
+    private static func setupEnvironmentVariables() {
+        setenv("RUST_BACKTRACE", "1", 1)
+    }
+    
     private static func setupServiceLocator(navigationRootCoordinator: NavigationRootCoordinator, appSettings: AppSettings) {
         ServiceLocator.shared.register(userIndicatorController: UserIndicatorController(rootCoordinator: navigationRootCoordinator))
         ServiceLocator.shared.register(appSettings: appSettings)
diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml
index c6080821de..2f2c893f52 100644
--- a/ElementX/SupportingFiles/target.yml
+++ b/ElementX/SupportingFiles/target.yml
@@ -19,9 +19,6 @@ schemes:
     run:
       config: Debug
       environmentVariables:
-        - variable: RUST_BACKTRACE
-          value: full
-          isEnabled: false
         - variable: HTTPS_PROXY
           value: localhost:9090
           isEnabled: false