Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml
#	src/ios/Pushwoosh.framework/Versions/A/Pushwoosh

Documentation/files/PushNotification-js.html

@@ -11,7 +11,7 @@
 
 
 
-<div id=Content><div class="CClass"><div class=CTopic id=MainTopic><h1 class=CTitle><a name="PushNotification"></a>PushNotification</h1><div class=CBody><p>Class to interact with Pushwoosh Push Notifications plugin</p><h4 class=CHeading>Example</h4><blockquote><pre class="prettyprint">var pushwoosh = cordova.require(&quot;com.pushwoosh.plugins.pushwoosh.PushNotification&quot;);
+<div id=Content><div class="CClass"><div class=CTopic id=MainTopic><h1 class=CTitle><a name="PushNotification"></a>PushNotification</h1><div class=CBody><p>Class to interact with Pushwoosh Push Notifications plugin</p><h4 class=CHeading>Example</h4><blockquote><pre class="prettyprint">var pushwoosh = cordova.require(&quot;pushwoosh-cordova-plugin.PushNotification&quot;);
 pushwoosh.onDeviceReady({ projectid: &quot;XXXXXXXXXXXXXXX&quot;, pw_appid : &quot;XXXXX-XXXXX&quot; });</pre></blockquote><!--START_ND_SUMMARY--><div class=Summary><div class=STitle>Summary</div><div class=SBorder><table border=0 cellspacing=0 cellpadding=0 class=STable><tr class="SMain"><td class=SEntry><a href="#PushNotification" >PushNotification</a></td><td class=SDescription>Class to interact with Pushwoosh Push Notifications plugin</td></tr><tr class="SGroup SIndent1"><td class=SEntry><a href="#PushNotification.Functions" >Functions</a></td><td class=SDescription></td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.registerDevice" id=link1 onMouseOver="ShowTip(event, 'tt1', 'link1')" onMouseOut="HideTip('tt1')">registerDevice</a></td><td class=SDescription>Call this to register for push notifications and retreive a push Token</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setTags" id=link2 onMouseOver="ShowTip(event, 'tt2', 'link2')" onMouseOut="HideTip('tt2')">setTags</a></td><td class=SDescription>Call this to set tags for the device</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.getPushToken" id=link3 onMouseOver="ShowTip(event, 'tt3', 'link3')" onMouseOut="HideTip('tt3')">getPushToken</a></td><td class=SDescription>Call this to get push token if it is available. </td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.getPushwooshHWID" id=link4 onMouseOver="ShowTip(event, 'tt4', 'link4')" onMouseOut="HideTip('tt4')">getPushwooshHWID</a></td><td class=SDescription>Call this to get Pushwoosh HWID used for communications with Pushwoosh API</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.onDeviceReady" id=link5 onMouseOver="ShowTip(event, 'tt5', 'link5')" onMouseOut="HideTip('tt5')">onDeviceReady</a></td><td class=SDescription>Call this first thing with your Pushwoosh App ID (pw_appid parameter) and Google Project ID for Android (projectid parameter)</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.getTags" id=link6 onMouseOver="ShowTip(event, 'tt6', 'link6')" onMouseOut="HideTip('tt6')">getTags</a></td><td class=SDescription>Call this to get tags for the device</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.unregisterDevice" id=link7 onMouseOver="ShowTip(event, 'tt7', 'link7')" onMouseOut="HideTip('tt7')">unregisterDevice</a></td><td class=SDescription>Unregisters device from push notifications</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.startLocationTracking" id=link8 onMouseOver="ShowTip(event, 'tt8', 'link8')" onMouseOut="HideTip('tt8')">startLocationTracking</a></td><td class=SDescription>Starts geolocation based push notifications. </td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.stopLocationTracking" id=link9 onMouseOver="ShowTip(event, 'tt9', 'link9')" onMouseOut="HideTip('tt9')">stopLocationTracking</a></td><td class=SDescription>Stops geolocation based push notifications</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.createLocalNotification" id=link10 onMouseOver="ShowTip(event, 'tt10', 'link10')" onMouseOut="HideTip('tt10')">createLocalNotification</a></td><td class=SDescription>Android only, Creates local notification, config params: {msg:&rdquo;message&rdquo;, seconds:30, userData:&rdquo;optional&rdquo;}</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.clearLocalNotification" id=link11 onMouseOver="ShowTip(event, 'tt11', 'link11')" onMouseOut="HideTip('tt11')">clearLocalNotification</a></td><td class=SDescription>Android only, Clears pending local notifications created by <a href="#PushNotification.createLocalNotification" class=LFunction id=link12 onMouseOver="ShowTip(event, 'tt10', 'link12')" onMouseOut="HideTip('tt10')">createLocalNotification</a></td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.clearNotificationCenter" id=link13 onMouseOver="ShowTip(event, 'tt12', 'link13')" onMouseOut="HideTip('tt12')">clearNotificationCenter</a></td><td class=SDescription>Android only, Clears all notifications presented in Android Notification Center</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.startGeoPushes" id=link14 onMouseOver="ShowTip(event, 'tt13', 'link14')" onMouseOut="HideTip('tt13')">startGeoPushes</a></td><td class=SDescription>Android only, Deprecated, use <a href="#PushNotification.startLocationTracking" class=LFunction id=link15 onMouseOver="ShowTip(event, 'tt8', 'link15')" onMouseOut="HideTip('tt8')">startLocationTracking</a> and <a href="#PushNotification.stopLocationTracking" class=LFunction id=link16 onMouseOver="ShowTip(event, 'tt9', 'link16')" onMouseOut="HideTip('tt9')">stopLocationTracking</a></td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.stopGeoPushes" id=link17 onMouseOver="ShowTip(event, 'tt14', 'link17')" onMouseOut="HideTip('tt14')">stopGeoPushes</a></td><td class=SDescription>Android only, Deprecated, use <a href="#PushNotification.startLocationTracking" class=LFunction id=link18 onMouseOver="ShowTip(event, 'tt8', 'link18')" onMouseOut="HideTip('tt8')">startLocationTracking</a> and <a href="#PushNotification.stopLocationTracking" class=LFunction id=link19 onMouseOver="ShowTip(event, 'tt9', 'link19')" onMouseOut="HideTip('tt9')">stopLocationTracking</a></td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.startBeaconPushes" id=link20 onMouseOver="ShowTip(event, 'tt15', 'link20')" onMouseOut="HideTip('tt15')">startBeaconPushes</a></td><td class=SDescription>Android only, iOS available per request, Call this to start beacon tracking</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.stopBeaconPushes" id=link21 onMouseOver="ShowTip(event, 'tt16', 'link21')" onMouseOut="HideTip('tt16')">stopBeaconPushes</a></td><td class=SDescription>Android only, iOS available per request, Call this to stop beacon tracking</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.setBeaconBackgroundMode" id=link22 onMouseOver="ShowTip(event, 'tt17', 'link22')" onMouseOut="HideTip('tt17')">setBeaconBackgroundMode</a></td><td class=SDescription>Android only, let the plugin know that the app went to background mode (or vise versa). </td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setMultiNotificationMode" id=link23 onMouseOver="ShowTip(event, 'tt18', 'link23')" onMouseOut="HideTip('tt18')">setMultiNotificationMode</a></td><td class=SDescription>Android only, Allows multiple notifications to be displayed in the Android Notification Center</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.setSingleNotificationMode" id=link24 onMouseOver="ShowTip(event, 'tt19', 'link24')" onMouseOut="HideTip('tt19')">setSingleNotificationMode</a></td><td class=SDescription>Android only, Allows only the last one notification to be displayed in the Android Notification Center</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setSoundType" id=link25 onMouseOver="ShowTip(event, 'tt20', 'link25')" onMouseOut="HideTip('tt20')">setSoundType</a></td><td class=SDescription>Android only, Sets default sound to play when push notification arrive. </td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.setVibrateType" id=link26 onMouseOver="ShowTip(event, 'tt21', 'link26')" onMouseOut="HideTip('tt21')">setVibrateType</a></td><td class=SDescription>Android only, Sets default vibration mode when push notification arrive. </td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setLightScreenOnNotification" id=link27 onMouseOver="ShowTip(event, 'tt22', 'link27')" onMouseOut="HideTip('tt22')">setLightScreenOnNotification</a></td><td class=SDescription>Android only, Should the screen be lit up when push notification arrive</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.setEnableLED" id=link28 onMouseOver="ShowTip(event, 'tt23', 'link28')" onMouseOut="HideTip('tt23')">setEnableLED</a></td><td class=SDescription>Android only, Set to enable led blinking when notification arrives and display is off</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setEnableLED" >setEnableLED</a></td><td class=SDescription>Android only, Set led color. </td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.getPushHistory" id=link29 onMouseOver="ShowTip(event, 'tt24', 'link29')" onMouseOut="HideTip('tt24')">getPushHistory</a></td><td class=SDescription>Android only, Gets push history, returns array of push notifications received.</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.clearPushHistory" id=link30 onMouseOver="ShowTip(event, 'tt25', 'link30')" onMouseOut="HideTip('tt25')">clearPushHistory</a></td><td class=SDescription>Android only, Clears push history</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.getRemoteNotificationStatus" id=link31 onMouseOver="ShowTip(event, 'tt26', 'link31')" onMouseOut="HideTip('tt26')">getRemoteNotificationStatus</a></td><td class=SDescription>iOS only, Call this to get a detailed status of push notification permissions.</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.setApplicationIconBadgeNumber" id=link32 onMouseOver="ShowTip(event, 'tt27', 'link32')" onMouseOut="HideTip('tt27')">setApplicationIconBadgeNumber</a></td><td class=SDescription>iOS only, Call this to set the application icon badge</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.getApplicationIconBadgeNumber" id=link33 onMouseOver="ShowTip(event, 'tt28', 'link33')" onMouseOut="HideTip('tt28')">getApplicationIconBadgeNumber</a></td><td class=SDescription>iOS only, Call this to get the application icon badge</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.addToApplicationIconBadgeNumber" id=link34 onMouseOver="ShowTip(event, 'tt29', 'link34')" onMouseOut="HideTip('tt29')">addToApplicationIconBadgeNumber</a></td><td class=SDescription>iOS only, Call this to add value to the application icon badge</td></tr><tr class="SFunction SIndent2 SMarked"><td class=SEntry><a href="#PushNotification.cancelAllLocalNotifications" id=link35 onMouseOver="ShowTip(event, 'tt30', 'link35')" onMouseOut="HideTip('tt30')">cancelAllLocalNotifications</a></td><td class=SDescription>iOS only, Call this to clear all notifications from the notification center</td></tr><tr class="SFunction SIndent2"><td class=SEntry><a href="#PushNotification.getLaunchNotification" id=link36 onMouseOver="ShowTip(event, 'tt31', 'link36')" onMouseOut="HideTip('tt31')">getLaunchNotification</a></td><td class=SDescription>Returns push notification payload if the app was started in response to push notification or null otherwise</td></tr></table></div></div><!--END_ND_SUMMARY--></div></div></div>
 
 <div class="CGroup"><div class=CTopic><h3 class=CTitle><a name="PushNotification.Functions"></a>Functions</h3></div></div>

README.md

@@ -3,23 +3,29 @@ Cordova Pushwoosh Push Notifications plugin
 
 Cross-Platform push notifications by Pushwoosh for Cordova / PhoneGap
 
-follows the Cordova Plugin spec http://cordova.apache.org/docs/en/3.0.0/plugin_ref_spec.md  
-so that it works with Plugman https://https://github.com/apache/cordova-plugman
+### Installation
 
-###Platform integration guides are available on Pushwoosh:
-####iOS:
-http://www.pushwoosh.com/programming-push-notification/ios/ios-additional-platforms/push-notification-sdk-integration-for-phonegap/
+Using npm (requires cordova 5.0+):
 
-####Android:
-http://www.pushwoosh.com/programming-push-notification/android/android-additional-platforms/phonegapcordova-sdk-integration/
+```
+cordova plugin add [email protected]
+```
 
-####WP8:
-http://www.pushwoosh.com/programming-push-notification/windows-phone/wp-additional-platforms/windows-phone-cordova-sdk-integration-guide/
+Using git:
+
+```
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#5.0.3
+```
+
+### Guide
+
+http://docs.pushwoosh.com/docs/cordova-phonegap
+
+### Documentation
 
-###Plugin documentation:  
 https://rawgit.com/Pushwoosh/pushwoosh-phonegap-3.0-plugin/master/Documentation/files/PushNotification-js.html
 
-## Acknowledgments
+### Acknowledgments
 Plugman support by Platogo
 
 HUGE thanks to Eddy Verbruggen for all the help with WP8 Phonegap support!!!

VERSION.md

@@ -1,3 +1,35 @@
+Current version: 5.0.3
+=========================
+Publish: Minimum version requirements for play-services-* and support-v4 references
+Current version: 5.0.2
+=========================
+Publish: Use Pushwoosh.aar as gradle reference
+Current version: 5.0.1
+=========================
+Publish: Fix missing module cache warnings
+Current version: 5.0.0
+=========================
+Publish: In-App Messages and Rich Media support
+Current version: 4.2.2
+=========================
+New plugin id (same as npm package name) to make it work on ionic. 
+Current version: 4.2.1
+=========================
+Set cordova id to pushwoosh-cordova-plugin
+Current version: 4.2.0
+=========================
+Publish: Fix issue 149 with [INSTALL_FAILED_CONFLICTING_PROVIDER]
+Current version: 4.1.1
+=========================
+Publish: WP8 Newtonsoft.Json.dll update
+Current version: 4.1.0
+=========================
+Android location tracking and geofencing
+iOS Pushwoosh.framework update
+WP8 plugin update
+Current version: 4.0.0
+=========================
+windows platform support
 Current version: 3.6.16
 =========================
 Add armv7s arch for iOS

package.json

@@ -1,9 +1,9 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "3.6.16",
+  "version": "5.0.3",
   "description": "\n    This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n    ",
   "cordova": {
-    "id": "com.pushwoosh.plugins.pushwoosh",
+    "id": "pushwoosh-cordova-plugin",
     "platforms": [
       "android",
       "ios",