summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLOfflinePack.mm
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-03-26 14:38:07 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-03-29 11:46:26 -0700
commite36f31c50302dc2194cc34fab7b89d9cef8c87a5 (patch)
treef130ddf8770b92ae91416b819b5d233932c09881 /platform/darwin/src/MGLOfflinePack.mm
parentec72faa7891a24795c9b040076de829642be043d (diff)
downloadqtlocation-mapboxgl-e36f31c50302dc2194cc34fab7b89d9cef8c87a5.tar.gz
[ios, osx] Allow creating invalid offline packs
Removed NS_UNAVAILABLE attribute from -[MGLOfflinePack init]. Packs initialized with this initializer are doomed to invalidity. Fixes #4421.
Diffstat (limited to 'platform/darwin/src/MGLOfflinePack.mm')
-rw-r--r--platform/darwin/src/MGLOfflinePack.mm12
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/darwin/src/MGLOfflinePack.mm b/platform/darwin/src/MGLOfflinePack.mm
index 279261e9be..30b268aaf1 100644
--- a/platform/darwin/src/MGLOfflinePack.mm
+++ b/platform/darwin/src/MGLOfflinePack.mm
@@ -48,11 +48,11 @@ private:
@implementation MGLOfflinePack
- (instancetype)init {
- [NSException raise:@"Method unavailable"
- format:
- @"-[MGLOfflinePack init] is unavailable. "
- @"Use +[MGLOfflineStorage addPackForRegion:withContext:completionHandler:] instead."];
- return nil;
+ if (self = [super init]) {
+ _state = MGLOfflinePackStateInvalid;
+ NSLog(@"%s called; did you mean to call +[MGLOfflineStorage addPackForRegion:withContext:completionHandler:] instead?", __PRETTY_FUNCTION__);
+ }
+ return self;
}
- (instancetype)initWithMBGLRegion:(mbgl::OfflineRegion *)region {
@@ -123,7 +123,7 @@ private:
}
- (void)requestProgress {
- MGLAssertOfflinePackIsValid();
+ NSAssert(_state != MGLOfflinePackStateInvalid, @"Cannot request progress from an invalid offline pack.");
mbgl::DefaultFileSource *mbglFileSource = [[MGLOfflineStorage sharedOfflineStorage] mbglFileSource];