Revert "add switchToLocationSettings to iOS".

This reverts commit 74e1d97. Resolves #262.
dpa99c · Dec 21, 2017 · 7f5bae2 · 7f5bae2
1 parent c201c21
commit 7f5bae2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ Cordova diagnostic plugin [![Latest Stable Version](https://img.shields.io/npm/v
     - [isWifiEnabled()](#iswifienabled)
     - [isCameraAvailable()](#iscameraavailable)
     - [isBluetoothAvailable()](#isbluetoothavailable)
-    - [switchToLocationSettings()](#switchtolocationsettings)
   - [Android and Windows 10 Mobile only](#android-and-windows-10-mobile-only)
+    - [switchToLocationSettings()](#switchtolocationsettings)
     - [switchToMobileDataSettings()](#switchtomobiledatasettings)
     - [switchToBluetoothSettings()](#switchtobluetoothsettings)
     - [switchToWifiSettings()](#switchtowifisettings)
@@ -422,6 +422,8 @@ This callback function is passed a single string parameter containing the error
         console.error("The following error occurred: "+error);
     });
 
+## Android and Windows 10 Mobile only
+
 ### switchToLocationSettings()
 
 Displays the device location settings to allow user to enable location services/change location mode.
@@ -430,8 +432,6 @@ Displays the device location settings to allow user to enable location services/
 
 Note: On Android, you may want to consider using the [Request Location Accuracy Plugin for Android](https://github.com/dpa99c/cordova-plugin-request-location-accuracy) to request the desired location accuracy without needing the user to manually do this on the Location Settings page.
 
-## Android and Windows 10 Mobile only
-
 ### switchToMobileDataSettings()
 
 Displays mobile settings to allow user to enable mobile data.

diff --git a/src/ios/Diagnostic.h b/src/ios/Diagnostic.h
@@ -63,7 +63,6 @@
 - (void) isRegisteredForRemoteNotifications: (CDVInvokedUrlCommand*)command;
 
 - (void) switchToSettings: (CDVInvokedUrlCommand*)command;
-- (void) switchToLocationSettings: (CDVInvokedUrlCommand*)command;
 
 - (void) isMicrophoneAuthorized: (CDVInvokedUrlCommand*)command;
 - (void) getMicrophoneAuthorizationStatus: (CDVInvokedUrlCommand*)command;

diff --git a/src/ios/Diagnostic.m b/src/ios/Diagnostic.m
@@ -339,35 +339,6 @@ - (void) switchToSettings: (CDVInvokedUrlCommand*)command
     }
 }
 
-- (void) switchToLocationSettings: (CDVInvokedUrlCommand*)command
-{
-    CDVPluginResult* pluginResult;
-    @try {
-        if (UIApplicationOpenSettingsURLString != nil){
-            NSURL *url;
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED <= __IPHONE_8_0
-            url = [NSURL URLWithString: @"prefs:root=LOCATION_SERVICES"];
-#else
-            url = [NSURL URLWithString: @"App-Prefs:root=Privacy&path=LOCATION"];
-#endif
-
-            if (![[UIApplication sharedApplication] canOpenURL:url]) {
-                pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Cannot open phone settings, check the URL schema for iOS 11"];
-            }else{
-				[[UIApplication sharedApplication] openURL:url];
-            	pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-            }
-        }else{
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Not supported below iOS 8"];
-        }
-    }
-    @catch (NSException *exception) {
-        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
-    }
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
 #pragma mark - Audio
 - (void) isMicrophoneAuthorized: (CDVInvokedUrlCommand*)command
 {

diff --git a/www/ios/diagnostic.js b/www/ios/diagnostic.js
@@ -106,22 +106,6 @@ var Diagnostic = (function(){
             []);
     };
 
-    /**
-     * Switch to location settings
-     *
-     * @param {Function} successCallback - The callback which will be called when switch to settings is successful.
-     * @param {Function} errorCallback - The callback which will be called when switch to settings encounters an error.
-     * This callback function is passed a single string parameter containing the error message.
-     * This works only on iOS 8+. iOS 7 and below will invoke the errorCallback.
-     */
-    Diagnostic.switchToLocationSettings = function(successCallback, errorCallback) {
-        return cordova.exec(successCallback,
-            errorCallback,
-            'Diagnostic',
-            'switchToLocationSettings',
-            []);
-    };
-
     /************
      * Location *
      ************/