diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 11:44:05 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 20:58:51 +0100 |
commit | a71868fc8d68fec0b34988d90ef1165c0c87d1db (patch) | |
tree | 214a342fbc9dfafda5998fd7412619d07cb5a50c /platform | |
parent | 398344addc456fd951dfb31d95d2668bb60af009 (diff) | |
download | qtlocation-mapboxgl-a71868fc8d68fec0b34988d90ef1165c0c87d1db.tar.gz |
[build] move Reachability to platform/darwin
Diffstat (limited to 'platform')
-rw-r--r-- | platform/darwin/mbgl/storage/reachability.h | 95 | ||||
-rw-r--r-- | platform/darwin/mbgl/storage/reachability.m (renamed from platform/darwin/src/reachability.m) | 2 | ||||
-rw-r--r-- | platform/ios/config.cmake | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.m | 2 | ||||
-rw-r--r-- | platform/macos/config.cmake | 4 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView.mm | 2 |
7 files changed, 105 insertions, 6 deletions
diff --git a/platform/darwin/mbgl/storage/reachability.h b/platform/darwin/mbgl/storage/reachability.h new file mode 100644 index 0000000000..78e302eafc --- /dev/null +++ b/platform/darwin/mbgl/storage/reachability.h @@ -0,0 +1,95 @@ +/* + Copyright (c) 2011, Tony Million. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#import <Foundation/Foundation.h> +#import <SystemConfiguration/SystemConfiguration.h> + + +/** + * Create NS_ENUM macro if it does not exist on the targeted version of iOS or OS X. + * + * @see http://nshipster.com/ns_enum-ns_options/ + **/ +#ifndef NS_ENUM +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +#endif + +extern NSString *const kMGLReachabilityChangedNotification; + +typedef NS_ENUM(NSInteger, NetworkStatus) { + // Apple NetworkStatus Compatible Names. + NotReachable = 0, + ReachableViaWiFi = 2, + ReachableViaWWAN = 1 +}; + +@class MGLReachability; + +typedef void (^NetworkReachable)(MGLReachability * reachability); +typedef void (^NetworkUnreachable)(MGLReachability * reachability); + + +@interface MGLReachability : NSObject + +@property (nonatomic, copy) NetworkReachable reachableBlock; +@property (nonatomic, copy) NetworkUnreachable unreachableBlock; + +@property (nonatomic, assign) BOOL reachableOnWWAN; + + ++(instancetype)reachabilityWithHostname:(NSString*)hostname; +// This is identical to the function above, but is here to maintain +//compatibility with Apples original code. (see .m) ++(instancetype)reachabilityWithHostName:(NSString*)hostname; ++(instancetype)reachabilityForInternetConnection; ++(instancetype)reachabilityWithAddress:(void *)hostAddress; ++(instancetype)reachabilityForLocalWiFi; + +-(instancetype)initWithReachabilityRef:(SCNetworkReachabilityRef)ref; + +-(BOOL)startNotifier; +-(void)stopNotifier; + +-(BOOL)isReachable; +-(BOOL)isReachableViaWWAN; +-(BOOL)isReachableViaWiFi; + +// WWAN may be available, but not active until a connection has been established. +// WiFi may require a connection for VPN on Demand. +-(BOOL)isConnectionRequired; // Identical DDG variant. +-(BOOL)connectionRequired; // Apple's routine. +// Dynamic, on demand connection? +-(BOOL)isConnectionOnDemand; +// Is user intervention required? +-(BOOL)isInterventionRequired; + +-(NetworkStatus)currentReachabilityStatus; +-(SCNetworkReachabilityFlags)reachabilityFlags; +-(NSString*)currentReachabilityString; +-(NSString*)currentReachabilityFlags; + +@end diff --git a/platform/darwin/src/reachability.m b/platform/darwin/mbgl/storage/reachability.m index 8abcf5ae6d..aa6746a2a9 100644 --- a/platform/darwin/src/reachability.m +++ b/platform/darwin/mbgl/storage/reachability.m @@ -25,7 +25,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#import <mbgl/platform/darwin/reachability.h> +#import <mbgl/storage/reachability.h> #import <sys/socket.h> #import <netinet/in.h> diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 0813d0338f..3a574b2818 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -28,9 +28,10 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc + PRIVATE platform/darwin/mbgl/storage/reachability.h + PRIVATE platform/darwin/mbgl/storage/reachability.m PRIVATE platform/darwin/src/log_nslog.mm PRIVATE platform/darwin/src/nsthread.mm - PRIVATE platform/darwin/src/reachability.m PRIVATE platform/darwin/src/string_nsstring.mm # Image handling @@ -60,6 +61,7 @@ macro(mbgl_platform_core) ) target_include_directories(mbgl-core + PUBLIC platform/darwin PRIVATE platform/default ) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 466912c217..45ff2f826f 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -13,7 +13,7 @@ #include <mbgl/map/camera.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/platform/platform.hpp> -#include <mbgl/platform/darwin/reachability.h> +#include <mbgl/storage/reachability.h> #include <mbgl/platform/default/thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index d86114d016..e26ca51f8e 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -7,7 +7,7 @@ #import "MGLAPIClient.h" #import "MGLLocationManager.h" -#include <mbgl/platform/darwin/reachability.h> +#include <mbgl/storage/reachability.h> #include <sys/sysctl.h> // Event types diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 74dd5ebf31..b0f26ab2bb 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -28,9 +28,10 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc + PRIVATE platform/darwin/mbgl/storage/reachability.h + PRIVATE platform/darwin/mbgl/storage/reachability.m PRIVATE platform/darwin/src/log_nslog.mm PRIVATE platform/darwin/src/nsthread.mm - PRIVATE platform/darwin/src/reachability.m PRIVATE platform/darwin/src/string_nsstring.mm # Image handling @@ -53,6 +54,7 @@ macro(mbgl_platform_core) ) target_include_directories(mbgl-core + PUBLIC platform/darwin PRIVATE platform/default ) diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 513687f94e..288ed68d62 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -21,7 +21,7 @@ #import <mbgl/mbgl.hpp> #import <mbgl/annotation/annotation.hpp> #import <mbgl/map/camera.hpp> -#import <mbgl/platform/darwin/reachability.h> +#import <mbgl/storage/reachability.h> #import <mbgl/platform/default/thread_pool.hpp> #import <mbgl/gl/extension.hpp> #import <mbgl/gl/context.hpp> |