Merge pull request #1 from katzer/master

Merge changes to 0.8.4

CHANGELOG.md

@@ -3,6 +3,45 @@ ChangeLog
 
 Please also read the [Upgrade Guide](https://github.com/katzer/cordova-plugin-local-notifications/wiki/Upgrade-Guide) for more information.
 
+#### Version 0.8.4 (04.01.2016)
+- Bug fixes
+ - SyntaxError: missing ) after argument list
+
+#### Version 0.8.3 (03.01.2016)
+- Platform enhancements
+ - Support for the `Crosswalk Engine`
+ - Support for `cordova-ios@4` and the `WKWebView Engine`
+ - Support for `cordova-windows@4` and `Windows 10` without using hooks
+- Enhancements
+ - New `color` attribute for Android (Thanks to @Eusebius1920)
+ - New `quarter` intervall for iOS & Android
+ - `smallIcon` is optional (Android)
+ - `update` checks for permission like _schedule_
+ - Decreased time-frame for trigger event (iOS)
+ - Force `every:` to be a string on iOS
+- Bug fixes
+ - Fixed #634 option to skip permission check
+ - Fixed #588 crash when basename & extension can't be extracted (Android)
+ - Fixed #732 loop between update and trigger (Android)
+ - Fixed #710 crash due to >500 notifications (Android)
+ - Fixed #682 crash while resuming app from notification (Android 6)
+ - Fixed #612 cannot update icon or sound (Android)
+ - Fixed crashing get(ID) if notification doesn't exist
+ - Fixed #569 getScheduled returns two items per notification
+ - Fixed #700 notifications appears on bootup
+
+#### Version 0.8.2 (08.11.2015)
+- Submitted to npm
+- Initial support for the `windows` platform
+- Re-add autoCancel option on Android
+- Warn about unknown properties
+- Fix crash on iOS 9
+- Fixed webView-Problems with cordova-android 4.0
+- Fix get* with single id
+- Fix issue when passing data in milliseconds
+- Update device plugin id
+- Several other fixes
+
 #### Version 0.8.1 (08.03.2015)
 
 - Fix incompatibility with cordova version 3.5-3.0

README.md

@@ -1,19 +1,14 @@
 
+[![npm version](https://badge.fury.io/js/de.appplant.cordova.plugin.local-notification.svg)](http://badge.fury.io/js/de.appplant.cordova.plugin.local-notification)
 [![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L3HKQCD9UA35A "Donate once-off to this project using Paypal")
 
-#### :bangbang: Please vote for these cordova-windows issues :bangbang:
-1. https://issues.apache.org/jira/browse/CB-8674 _(Missing launch arguments)_
-2. https://issues.apache.org/jira/browse/CB-8946 _(Missing ToastCapable flag)_
-
-Thanks a lot!
-
 Cordova Local-Notification Plugin
 =================================
 
 The essential purpose of local notifications is to enable an application to inform its users that it has something for them — for example, a message or an upcoming appointment — when the application isn’t running in the foreground.<br>
 They are scheduled by an application and delivered on the same device.
 
-<img width="35%" align="right" hspace="19" vspace="12" src="https://github.com/katzer/cordova-plugin-local-notifications/blob/example/images/android.png"></img>
+<img width="35%" align="right" hspace="19" vspace="12" src="https://raw.githubusercontent.com/katzer/cordova-plugin-local-notifications/example/images/android.png"></img>
 
 ### How they appear to the user
 Users see notifications in the following ways:
@@ -29,10 +24,11 @@ For example, applications that depend on servers for messages or data can poll t
 
 ## Supported Platforms
 The current 0.8 branch supports the following platforms:
-- __iOS__ _(including iOS8)_<br>
+- __iOS__ _(>= 8)_<br>
 - __Android__ _(SDK >=7)_
 - __Windows 8.1__ _(added with v0.8.2)_
 - __Windows Phone 8.1__ _(added with v0.8.2)_
+- __Windows 10__ _(added with v0.8.3)_
 
 Find out more informations [here][wiki_platforms] in our wiki.
 
@@ -119,7 +115,7 @@ Thank you!
 
 This software is released under the [Apache 2.0 License][apache2_license].
 
-© 2013-2015 appPlant UG, Inc. All rights reserved
+© 2013-2016 appPlant UG, Inc. All rights reserved
 
 
 [cordova]: https://cordova.apache.org

package.json

@@ -0,0 +1,52 @@
+{
+  "name": "de.appplant.cordova.plugin.local-notification",
+  "cordova_name": "Cordova LocalNotification Plugin",
+  "version": "0.8.4",
+  "description": "Schedules and queries for local notifications",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/katzer/cordova-plugin-local-notifications.git"
+  },
+  "keywords": [
+    "appplant",
+    "notification",
+    "local notification",
+    "cordova",
+    "ecosystem:cordova",
+    "cordova-android",
+    "cordova-ios",
+    "cordova-windows"
+  ],
+  "platforms": [
+    "ios",
+    "android",
+    "windows"
+  ],
+  "engines": [
+    {
+      "name": "cordova",
+      "version": ">=3.6.0"
+    },
+    {
+      "name": "cordova-plugman",
+      "version": ">=4.3.0"
+    },
+    {
+      "name": "cordova-windows",
+      "version": ">=4.2.0"
+    }
+  ],
+  "dependencies": {
+    "cordova-plugin-device": "*",
+    "cordova-plugin-app-event": ">=1.1.0"
+  },
+  "author": "Sebastián Katzer",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/katzer/cordova-plugin-local-notifications/issues"
+  },
+  "homepage": "https://github.com/katzer/cordova-plugin-local-notifications#readme"
+}

plugin.xml

@@ -3,7 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="de.appplant.cordova.plugin.local-notification"
-        version="0.8.2-dev">
+        version="0.8.4">
 
     <name>LocalNotification</name>
 
@@ -20,11 +20,14 @@
     <!-- cordova -->
     <engines>
         <engine name="cordova" version=">=3.6.0" />
-        <engine name="cordova" version="<4.0.0" />
+        <!-- TODO next version: Probably I meant cordova-lib -->
+        <!-- <engine name="cordova-plugman" version=">=4.3.0" /> -->
+        <engine name="cordova-windows" version=">=4.2.0" />
     </engines>
 
     <!-- dependencies -->
     <dependency id="cordova-plugin-device" />
+    <dependency id="cordova-plugin-app-event" />
 
     <!-- info -->
     <info>
@@ -53,8 +56,6 @@
     <!-- ios -->
     <platform name="ios">
 
-        <dependency id="de.appplant.cordova.common.registerusernotificationsettings" />
-
         <config-file target="config.xml" parent="/*">
             <feature name="LocalNotification">
                 <param name="ios-package" value="APPLocalNotification" onload="true" />
@@ -79,7 +80,7 @@
     <!-- android -->
     <platform name="android">
 
-        <dependency id="cordova-plugin-android-support-v4" />
+        <framework src="com.android.support:support-v4:+" value="gradle" />
 
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="LocalNotification">
@@ -203,6 +204,10 @@
     <!-- windows -->
     <platform name="windows">
 
+        <config-file target="config.xml" parent="/*" >
+            <preference name="WindowsToastCapable" value="true" />
+        </config-file>
+
         <js-module src="src/windows/LocalNotificationProxy.js" name="LocalNotification.Proxy" >
             <merges target="" />
         </js-module>
@@ -215,14 +220,6 @@
             <merges target="" />
         </js-module>
 
-        <!-- Platform Hooks -->
-        <hook type="after_platform_add" src="scripts/windows/setToastCapable.js" />
-        <hook type="after_plugin_install" src="scripts/windows/setToastCapable.js" />
-
-        <hook type="after_platform_add" src="scripts/windows/broadcastActivateEvent.js" />
-        <hook type="after_plugin_install" src="scripts/windows/broadcastActivateEvent.js" />
-        <hook type="after_prepare" src="scripts/windows/broadcastActivateEvent.js" />
-
     </platform>
 
 </plugin>

src/android/ClickActivity.java

@@ -44,13 +44,13 @@ public class ClickActivity extends de.appplant.cordova.plugin.notification.Click
     public void onClick(Notification notification) {
         LocalNotification.fireEvent("click", notification);
 
-        if (!notification.getOptions().isOngoing()) {
-            String event = notification.isRepeating() ? "clear" : "cancel";
+        super.onClick(notification);
 
-            LocalNotification.fireEvent(event, notification);
-        }
+        if (notification.getOptions().isOngoing())
+            return;
 
-        super.onClick(notification);
+        String event = notification.isRepeating() ? "clear" : "cancel";
+        LocalNotification.fireEvent(event, notification);
     }
 
     /**