Merge branch 'development'

.gitignore

@@ -1,2 +1,3 @@
+
 .DS_Store
 node_modules

.jshintrc

@@ -1,3 +1,4 @@
+
 {
   "predef": [
     "document",

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode8
 env:
   - PATH=$PATH:$TRAVIS_BUILD_DIR/node_modules/.bin
 git:
@@ -8,9 +8,9 @@ node_js:
   - "4.1"
 install:
   - npm install -g ios-sim
+  - npm install -g ios-deploy
   - npm install
-  - npm link
 before_script:
   - ios-sim start --devicetypeid=iPhone-6
 script:
-  - cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR} --verbose
+  - FIX_PARAMEDIC=true cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR} --verbose

CHANGELOG.md

@@ -1,5 +1,13 @@
 # ChangeLog
 
+## Version 0.6.0 - 15.04.2016
+
+- Support for Android 6 new permission acquiring model
+- Support for Cordova 6.0
+- Fix for notification permissions on iOS 8
+- Removed unnecessary WRITE_STORAGE permissions on Android
+- initialize method fails when required permissions are not granted
+
 ## Version 0.5.0 - 09.11.2015
 
 - Support for new Google API

LICENSE

@@ -1,4 +1,5 @@
 
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,4 +200,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

circle.yml

@@ -1,3 +1,4 @@
+
 machine:
   environment:
     ANDROID_NDK_HOME: $ANDROID_NDK

hooks/install_prerequisites.js

@@ -0,0 +1,18 @@
+console.log("Running hook to install push notifications pre-requisites");
+
+module.exports = function (context) {
+  var child_process = context.requireCordovaModule('child_process'),
+      deferral = context.requireCordovaModule('q').defer();
+
+  var output = child_process.exec('npm install', {cwd: __dirname}, function (error) {
+    if (error !== null) {
+      console.log('exec error: ' + error);
+      deferral.reject('npm installation failed');
+    }
+    else {
+      deferral.resolve();
+    }
+  });
+
+  return deferral.promise;
+};

hooks/package.json

@@ -0,0 +1,17 @@
+{
+  "dependencies": {
+    "xcode":"^0.8.3",
+    "xmldom":"0.1.15",
+    "xmlbuilder": "2.2.1",
+    "util-deprecate": "1.0.0",
+    "stream-buffers": "~0.2.3",
+    "simple-plist": "0.0.4",
+    "plist": "1.1.0",
+    "pegjs": "0.6.2",
+    "node-uuid": "1.3.3",
+    "lodash-node": "~2.4.1",
+    "bplist-parser": "0.0.6",
+    "bplist-creator": "0.0.4",
+    "base64-js": "0.0.6"
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-geofence",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Cordova geofence plugin",
   "cordova": {
     "id": "cordova-plugin-geofence",
@@ -12,6 +12,9 @@
       "windows"
     ]
   },
+  "scripts": {
+    "test": "cordova-paramedic --platform android --plugin ."
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cowbell/cordova-plugin-geofence.git"
@@ -39,8 +42,9 @@
       "version": ">=5.0.0"
     }
   ],
+  "typings": "./typings/cordova-plugin-geofence.d.ts",
   "devDependencies": {
-    "cordova": "^5.0.0",
-    "cordova-paramedic": "^0.4.0"
+    "cordova": "^6.1.1",
+    "cordova-paramedic": "https://github.com/apache/cordova-paramedic"
   }
 }

plugin.xml

@@ -19,10 +19,9 @@
         <clobbers target="geofence" />
     </js-module>
 
-    <dependency
-  	id="es6-promise-plugin"
-  	url="https://github.com/vstirbu/PromisesPlugin.git">
-    </dependency>
+    <!-- <dependency id="cordova-plugin-add-swift-support" version="1.6.0" />-->
+    <dependency id="cordova-plugin-compat" version="^1.0.0" />
+    <dependency id="es6-promise-plugin" />
 
     <!-- android -->
     <platform name="android">
@@ -43,6 +42,7 @@
         <source-file src="src/android/JSONHelper.java" target-dir="src/com/cowbell/cordova/geofence" />
         <source-file src="src/android/LocalStorage.java" target-dir="src/com/cowbell/cordova/geofence" />
         <source-file src="src/android/LocalStorageDBHelper.java" target-dir="src/com/cowbell/cordova/geofence" />
+        <source-file src="src/android/LocationProviderChangedReceiver.java" target-dir="src/com/cowbell/cordova/geofence"/>
         <source-file src="src/android/Logger.java" target-dir="src/com/cowbell/cordova/geofence" />
         <source-file src="src/android/Notification.java" target-dir="src/com/cowbell/cordova/geofence" />
         <source-file src="src/android/ReceiveTransitionsIntentService.java" target-dir="src/com/cowbell/cordova/geofence" />
@@ -68,7 +68,12 @@
                     <action android:name="android.intent.action.BOOT_COMPLETED" />
                 </intent-filter>
             </receiver>
-
+            <receiver android:name="com.cowbell.cordova.geofence.LocationProviderChangedReceiver">
+                <intent-filter>
+                    <action android:name="android.location.PROVIDERS_CHANGED"/>
+                </intent-filter>
+            </receiver>
+
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest">
@@ -116,7 +121,8 @@
 
     <!-- ios -->
     <platform name="ios">
-        <hook type="after_plugin_install" src="hooks/add_swift_support.js" />
+        <hook type="after_plugin_add" src="hooks/install_prerequisites.js"/>
+        <hook type="after_plugin_add" src="hooks/add_swift_support.js" />
         <config-file target="*-Info.plist" parent="NSLocationAlwaysUsageDescription">
             <string>${EXECUTABLE_NAME} Would Like to Use Your Current Location Even In Background.</string>
         </config-file>
@@ -133,11 +139,13 @@
             <param name="ios-package" value="HWPGeofencePlugin"/>
           </feature>
         </config-file>
-        <header-file src="src/ios/Geo-Bridging-Header.h" />
+        <header-file src="src/ios/Geofence-Plugin-Bridging-Header.h" />
         <source-file src="src/ios/GeofencePlugin.swift"/>
         <source-file src="src/ios/SwiftData.swift"/>
         <source-file src="src/ios/SwiftyJson.swift"/>
-
+        <framework src="libsqlite3.dylib"/>
+        <framework src="WebKit.framework" weak="true" />
+
         <header-file src="src/ios/AppDelegate+Geofencing.h"/>
         <source-file src="src/ios/AppDelegate+Geofencing.m"/>
         <header-file src="src/ios/GeofenceHelper.h"/>

src/android/LocationProviderChangedReceiver.java

@@ -0,0 +1,46 @@
+package com.cowbell.cordova.geofence;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.location.LocationManager;
+
+/**
+ * Created by domingosgomes on 11/01/17.
+ */
+public class LocationProviderChangedReceiver extends BroadcastReceiver {
+    private String GpsPreferences = "GpsPreferences";
+    private String GpsSharePreferences = "GpsHasEnable";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        boolean isGpsEnabled;
+        if (intent.getAction().matches("android.location.PROVIDERS_CHANGED"))
+        {
+            LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+            isGpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+            Boolean GpsHasEnable = getGpsState(context);
+            //Start your Activity if location was enabled:
+            if (isGpsEnabled && !GpsHasEnable) {
+                Logger.setLogger(new Logger(GeofencePlugin.TAG, context, false));
+                GeoNotificationManager manager = new GeoNotificationManager(context);
+                manager.loadFromStorageAndInitializeGeofences();
+            }
+            setGpsState(isGpsEnabled,context);
+        }
+    }
+
+    public void setGpsState(Boolean state, Context context){
+        SharedPreferences sharedPref = context.getSharedPreferences(GpsPreferences,Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putBoolean(GpsSharePreferences, state);
+        editor.commit();
+    }
+
+    public Boolean getGpsState(Context context){
+        SharedPreferences sharedPref =  context.getSharedPreferences(GpsPreferences,Context.MODE_PRIVATE);
+        Boolean gpsState = sharedPref.getBoolean(GpsSharePreferences,true);
+        return gpsState;
+    }
+}

src/ios/AppDelegate+Geofencing.m

@@ -79,24 +79,6 @@ - (BOOL) geofencing_application:(UIApplication *)application didFinishLaunchingW
     return [self geofencing_application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
--(void) geofence_application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
-{
-    NSLog(@"Did Receive Local Notification Delegate - Geofence");
-
-    if(notification != nil && notification.userInfo && [notification.userInfo objectForKey:@"geofence.notification.data"]) {
-        NSDictionary *userInfo = notification.userInfo;
-        NSURL *siteURL = [NSURL URLWithString:[userInfo objectForKey:@"deeplink"]];
-
-        if(siteURL && [userInfo objectForKey:@"deeplink"] && ![[userInfo objectForKey:@"deeplink"] isEqualToString:@""]) {
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                [[UIApplication sharedApplication] openURL:siteURL];
-            });
-        }
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"CDVLocalNotificationGeofence" object:notification];
-    }
-    [self geofence_application:application didReceiveLocalNotification:notification];
-}
-
 -(void) locationManager:(CLLocationManager *)manager didEnterRegion:(CLRegion *)region
 {
     UIApplicationState state = [[UIApplication sharedApplication] applicationState];

src/ios/Geofence-Plugin-Bridging-Header.h

@@ -0,0 +1,9 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <Cordova/CDV.h>
+#import <Cordova/CDVAvailability.h>
+#import <CoreLocation/CoreLocation.h>
+#import "sqlite3.h"
+#import "GeofenceHelper.h"

src/ios/SwiftData.swift

@@ -2148,4 +2148,4 @@ extension String {
 
         return nsSt.stringByAppendingPathExtension(ext)
     }
-}
+}

src/ios/SwiftyJson.swift

@@ -1362,4 +1362,4 @@ public func >=(lhs: NSNumber, rhs: NSNumber) -> Bool {
     default:
         return lhs.compare(rhs) != NSComparisonResult.OrderedAscending
     }
-}
+}

src/windows/GeofenceProxy.js

@@ -1,4 +1,5 @@
-module.exports = {
+
+module.exports = {
     initialize: function (success, fail, args, env) {
         GeofenceComponent.GeofenceTrigger.register();
         success && success();

tests/.jshintrc

@@ -1,3 +1,4 @@
+
 {
   "predef": [
     "document",

tests/hooks/fix-swift-paramedic.js

@@ -0,0 +1,69 @@
+var child_process = require('child_process'),
+    fs = require('fs'),
+    path = require('path');
+
+module.exports = function(context) {
+    var COMMENT_KEY = /_comment$/,
+        CORDOVA_VERSION = process.env.CORDOVA_VERSION;
+
+    if (!process.env.FIX_PARAMEDIC) {
+        return;
+    }
+
+    run();
+
+    function run() {
+        var cordova_util = context.requireCordovaModule('cordova-lib/src/cordova/util'),
+            ConfigParser = CORDOVA_VERSION >= 6.0
+                ? context.requireCordovaModule('cordova-common').ConfigParser
+                : context.requireCordovaModule('cordova-lib/src/configparser/ConfigParser'),
+            projectRoot = cordova_util.isCordova(),
+            platform_ios,
+            xml = cordova_util.projectConfig(projectRoot),
+            cfg = new ConfigParser(xml),
+            projectName = cfg.name(),
+            platform_ios = CORDOVA_VERSION < 5.0
+                ? context.requireCordovaModule('cordova-lib/src/plugman/platforms')['ios']
+                : context.requireCordovaModule('cordova-lib/src/plugman/platforms/ios'),
+            iosPlatformPath = path.join(projectRoot, 'platforms', 'ios'),
+            iosProjectFilesPath = path.join(iosPlatformPath, projectName),
+            xcconfigPath = path.join(iosPlatformPath, 'cordova', 'build.xcconfig'),
+            xcconfigContent,
+            projectFile,
+            xcodeProject,
+            bridgingHeaderPath;
+
+        projectFile = platform_ios.parseProjectFile(iosPlatformPath);
+        xcodeProject = projectFile.xcode;
+
+
+        var configurations = nonComments(xcodeProject.pbxXCBuildConfigurationSection()),
+        config, buildSettings;
+
+        for (config in configurations) {
+            buildSettings = configurations[config].buildSettings;
+            buildSettings['SWIFT_VERSION'] = '2.3'
+        }
+        console.log('IOS project Swift Version changed to 2.3 ...');
+
+        projectFile.write();
+    }
+
+    function nonComments(obj) {
+        var keys = Object.keys(obj),
+            newObj = {},
+            i = 0;
+
+        for (i; i < keys.length; i++) {
+            if (!COMMENT_KEY.test(keys[i])) {
+                newObj[keys[i]] = obj[keys[i]];
+            }
+        }
+
+        return newObj;
+    }
+
+    function unquote(str) {
+        if (str) return str.replace(/^"(.*)"$/, "$1");
+    }
+}

tests/plugin.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-geofence-test" version="0.5.0">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-geofence-test" version="0.6.0">
     <name>Geofence plugin Tests</name>
     <license>Apache 2.0</license>
 
     <js-module src="tests.js" name="tests">
     </js-module>
+
+    <platform name="ios">
+        <hook type="before_run" src="hooks/fix-swift-paramedic.js" />
+    </platform>
 </plugin>

tests/tests.js

@@ -1,3 +1,4 @@
+
 exports.defineAutoTests = function () {
     var fail = function (done, reason) {
             if (reason) {