Improve environment parameters handling

Legoless · Oct 18, 2019 · afa86f3 · afa86f3
1 parent fb3fb28
commit afa86f3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Analytical/Classes/Provider/BranchProvider.swift b/Analytical/Classes/Provider/BranchProvider.swift
@@ -18,17 +18,15 @@ public class BranchProvider : BaseProvider<Branch>, AnalyticalProvider {
     private var launchOptions = [UIApplication.LaunchOptionsKey: Any]?
 
     public func setup(with properties: Properties?) {
+        launchOptions = properties?[Property.Launch.options.rawValue] as? [UIApplication.LaunchOptionsKey: Any]
 
-        guard let shouldUseTestKey = properties?[BranchProvider.ShouldUseTestKey] as? Bool, let isDebugEnabled = properties?[BranchProvider.IsDebugEnabled] as? Bool else {
-            return
+        if let shouldUseTestKey = properties?[BranchProvider.ShouldUseTestKey] as? Bool {
+            Branch.setUseTestBranchKey(shouldUseTestKey)
         }
 
-        launchOptions = properties?[Property.Launch.options.rawValue] as? [UIApplication.LaunchOptionsKey: Any]
-
-        Branch.setUseTestBranchKey(shouldUseTestKey)
         instance = Branch.getInstance()
 
-        if isDebugEnabled {
+        if properties?[BranchProvider.IsDebugEnabled] as? Bool ?? false {
             instance.setDebug()
         }