Look at previously cached settings before blowing them away. (#866)

segmentio · Feb 21, 2020 · 0891ee3 · asoneji · May 20, 2020 · 0891ee3
1 parent 3ed8340
commit 0891ee3
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/Analytics/Classes/Integrations/SEGIntegrationsManager.m b/Analytics/Classes/Integrations/SEGIntegrationsManager.m
@@ -394,14 +394,19 @@ - (void)refreshSettings
                 if (success) {
                     [self setCachedSettings:settings];
                 } else {
-                    // If settings request fail, fall back to using just Segment integration.
-                    // Doesn't address situations where this callback never gets called (though we don't expect that to ever happen).
-                    [self setCachedSettings:@{
-                        @"integrations" : @{
-                            @"Segment.io" : @{@"apiKey" : self.configuration.writeKey},
-                        },
-                        @"plan" : @{@"track" : @{}}
-                    }];
+                    NSDictionary *previouslyCachedSettings = [self cachedSettings];
+                    if (previouslyCachedSettings) {
+                        [self setCachedSettings:previouslyCachedSettings];
+                    } else {
+                        // If settings request fail, fall back to using just Segment integration.
+                        // Doesn't address situations where this callback never gets called (though we don't expect that to ever happen).
+                        [self setCachedSettings:@{
+                            @"integrations" : @{
+                                @"Segment.io" : @{@"apiKey" : self.configuration.writeKey},
+                            },
+                            @"plan" : @{@"track" : @{}}
+                        }];
+                    }
                 }
                 self.settingsRequest = nil;
             });