[ios, macos] Ignore progress updates after suspending

mapbox · Aug 27, 2016 · adf5733 · adf5733
1 parent f4be826
commit adf5733
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/platform/darwin/src/MGLOfflinePack.mm b/platform/darwin/src/MGLOfflinePack.mm
@@ -43,7 +43,9 @@ @interface MGLOfflinePack ()
 
 @end
 
-@implementation MGLOfflinePack
+@implementation MGLOfflinePack {
+    BOOL _isSuspending;
+}
 
 - (instancetype)init {
     if (self = [super init]) {
@@ -93,6 +95,11 @@ - (void)resume {
 - (void)suspend {
     MGLAssertOfflinePackIsValid();
 
+    if (self.state == MGLOfflinePackStateActive) {
+        self.state = MGLOfflinePackStateInactive;
+        _isSuspending = YES;
+    }
+
     mbgl::DefaultFileSource *mbglFileSource = [[MGLOfflineStorage sharedOfflineStorage] mbglFileSource];
     mbglFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Inactive);
 }
@@ -117,7 +124,10 @@ - (void)setState:(MGLOfflinePackState)state {
 
     NSAssert(_state != MGLOfflinePackStateInvalid, @"Cannot change the state of an invalid offline pack.");
 
-    _state = state;
+    if (!_isSuspending || state != MGLOfflinePackStateActive) {
+        _isSuspending = NO;
+        _state = state;
+    }
 }
 
 - (void)requestProgress {
@@ -150,6 +160,10 @@ - (void)offlineRegionStatusDidChange:(mbgl::OfflineRegionStatus)status {
             break;
     }
 
+    if (_isSuspending) {
+        return;
+    }
+
     MGLOfflinePackProgress progress;
     progress.countOfResourcesCompleted = status.completedResourceCount;
     progress.countOfBytesCompleted = status.completedResourceSize;