[ios] Guard against over calling pause or resume

mapbox · Mar 19, 2017 · 73ed8aa · 73ed8aa
1 parent e4981d5
commit 73ed8aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
@@ -120,9 +120,6 @@ class DefaultFileSource : public FileSource {
      *
      * If pause is called then no revalidation or network request activity
      * will occur.
-     *
-     * Note: Calling pause and then calling getAPIBaseURL or getAccessToken
-     * will lock the thread that those calls are made on.
      */
     void pause();
 

diff --git a/platform/darwin/src/MGLOfflineStorage.mm b/platform/darwin/src/MGLOfflineStorage.mm
@@ -31,6 +31,7 @@ @interface MGLOfflineStorage ()
 
 @property (nonatomic, strong, readwrite) NS_MUTABLE_ARRAY_OF(MGLOfflinePack *) *packs;
 @property (nonatomic) mbgl::DefaultFileSource *mbglFileSource;
+@property (nonatomic, getter=isPaused) BOOL paused;
 
 @end
 
@@ -53,11 +54,19 @@ + (instancetype)sharedOfflineStorage {
 
 #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
 - (void)pauseFileSource:(__unused NSNotification *)notification {
+    if (self.isPaused) {
+        return;
+    }
     _mbglFileSource->pause();
+    self.paused = YES;
 }
 
 - (void)unpauseFileSource:(__unused NSNotification *)notification {
+    if (!self.isPaused) {
+        return;
+    }
     _mbglFileSource->resume();
+    self.paused = NO;
 }
 #endif