diff --git a/api/MapsWithMeAPI.m b/api/MapsWithMeAPI.m index 801bbab..6545df3 100644 --- a/api/MapsWithMeAPI.m +++ b/api/MapsWithMeAPI.m @@ -60,11 +60,41 @@ static BOOL openUrlOnBalloonClick = NO; @end // Utility class to automatically handle "MapsWithMe is not installed" situations -@interface MWMNavigationController : UINavigationController +@interface MWMNViewController : UIViewController @end -@implementation MWMNavigationController +@implementation MWMNViewController + +// HTML page for users who didn't install MapsWithMe +static NSString * mapsWithMeIsNotInstalledPage = +@"" \ +"" \ +"Please install MapsWithMe - offline maps of the World" \ +"" \ +"" \ +"" \ +"" \ +"" \ +"
Offline maps are required to proceed. We have partnered with MapsWithMe to provide you with offline maps of the entire world.
" \ +"
To continue please download the app:
" \ +"Download MapsWithMe Pro" \ +"Download MapsWithMe Lite (free)" \ +"" \ +""; + +- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error +{ + [(UIWebView *)self.view loadHTMLString:mapsWithMeIsNotInstalledPage baseURL:[NSURL URLWithString:@"http://mapswith.me/"]]; +} - (void)onCloseButtonClicked:(id)sender { @@ -197,48 +227,17 @@ static BOOL openUrlOnBalloonClick = NO; return nil; } -// HTML page for users who didn't install MapsWithMe -static NSString * mapsWithMeIsNotInstalledPage = -@"" \ -"" \ -"Please install MapsWithMe - offline maps of the World" \ -"" \ -"" \ -"" \ -"" \ -"" \ -"
Offline maps are required to proceed. We have partnered with MapsWithMe to provide you with offline maps of the entire world.
" \ -"
To continue please download the app:
" \ -"Download MapsWithMe Pro" \ -"Download MapsWithMe Lite (free)" \ -"" \ -""; - - -// For gethostbyname below -#include - + (void)showMapsWithMeIsNotInstalledDialog { UIWebView * webView = [[UIWebView alloc] initWithFrame:[UIScreen mainScreen].applicationFrame]; // check that we have Internet connection and display fresh online page if possible - if (gethostbyname("mapswith.me")) - [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://mapswith.me/api_mwm_not_installed"]]]; - else - [webView loadHTMLString:mapsWithMeIsNotInstalledPage baseURL:[NSURL URLWithString:@"http://mapswith.me/"]]; - UIViewController * webController = [[UIViewController alloc] init]; + [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://mapswith.me/api_mwm_not_installed"]]]; + MWMNViewController * webController = [[MWMNViewController alloc] init]; + webView.delegate = webController; webController.view = webView; webController.title = @"Install MapsWithMe"; - MWMNavigationController * navController = [[MWMNavigationController alloc] initWithRootViewController:webController]; - navController.navigationBar.topItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStyleDone target:navController action:@selector(onCloseButtonClicked:)]; + UINavigationController * navController = [[UINavigationController alloc] initWithRootViewController:webController]; + navController.navigationBar.topItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStyleDone target:webController action:@selector(onCloseButtonClicked:)]; UIWindow * window = [[UIApplication sharedApplication].windows firstObject]; if ([window.subviews count] == 2)