Merge pull request #23 from JoaoCaixinha/master

realtime-framework · web-flow · commit e56a1a6a2c69 · 2016-11-04T17:53:49.000Z
added methods to set the notification display mode
diff --git a/README.md b/README.md
@@ -128,7 +128,13 @@ Push Notifications only work in real devices for the iOS platform (not on simula
 	    <color name="notification_color">#ff0000</color>
 	</resources> 	 
 
+### Set notifications display mode
 
+Only available for android. [Check android documentation](https://developer.android.com/guide/topics/ui/notifiers/notifications.html#Heads-up)
+
+**enableHeadsUpNotifications** Use this method to set the notification display type to Heads-up. This method persists the set value, to disable the heads-up notifications you must call `disableHeadsUpNotifications`.
+
+**disableHeadsUpNotifications** Use this method to set the default notifications display (only the small icon is shown in the notification bar) and disable Heads-up.
 
 ## Usage example
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordovapush",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "This Cordova plugin should be used with the iOS/Android platforms together with the Realtime Messaging library (ORTC) for Push Notifications support.",
   "main": "index.js",
   "scripts": {
diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     id="co.realtime.plugins.CordovaPush"
-    version="0.1.25">
+    version="0.1.26">
 
   <name>cordovapush</name>
 	<author>Reatime</author>
diff --git a/src/android/GcmReceiver.java b/src/android/GcmReceiver.java
@@ -5,9 +5,11 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
@@ -74,6 +76,7 @@ public void createNotification(Context context, Bundle extras)
         NotificationCompat.Builder mBuilder =
                 new NotificationCompat.Builder(context)
                         .setDefaults(defaults)
+                        .setPriority(getAppPriority(context))
                         .setLargeIcon(appIcon)
                         .setSmallIcon(smallIcon)
                         .setWhen(System.currentTimeMillis())
@@ -129,4 +132,18 @@ private static String getAppName(Context context)
 
         return (String)appName;
     }
+
+    public static int getAppPriority(Context context){
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        int val = preferences.getInt("APP_PRIORITY", 0);
+        return val;
+    }
+
+    public static void setAppPriority(Context context, int priority){
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt("APP_PRIORITY", priority);
+        editor.apply();
+    }
+
 }
diff --git a/src/android/OrtcPushPlugin.java b/src/android/OrtcPushPlugin.java
@@ -1,6 +1,7 @@
 package co.realtime.plugins.android.cordovapush;
 
 import android.app.NotificationManager;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -39,6 +40,8 @@ public class OrtcPushPlugin extends CordovaPlugin {
     public static final String ACTION_UNSUBSCRIBE = "unsubscribe";
     public static final String ACTION_CANCEL_NOTIFICATIONS = "cancelAllLocalNotifications";
     public static final String ACTION_SEND_MESSAGE = "send";
+    private static final String ACTION_ENABLE_HEADS_UP_NOTIFICATIONS = "enableHeadsUpNotifications";
+    private static final String ACTION_DISABLE_HEADS_UP_NOTIFICATIONS = "disableHeadsUpNotifications";
     private OrtcClient client;
     private static CordovaWebView gWebView;
     private static Bundle gCachedExtras = null;
@@ -256,6 +259,16 @@ else if(ACTION_SET_ICON.equals(action)){
                 callbackContext.success();
                 return true;
             }
+            else if(ACTION_ENABLE_HEADS_UP_NOTIFICATIONS.equals(action)){
+                Context context = cordova.getActivity().getApplicationContext();
+                GcmReceiver.setAppPriority(context, 1);
+                return true;
+            }
+            else if(ACTION_DISABLE_HEADS_UP_NOTIFICATIONS.equals(action)){
+                Context context = cordova.getActivity().getApplicationContext();
+                GcmReceiver.setAppPriority(context, 0);
+                return true;
+            }
             callbackContext.error("Invalid action");
             return false;
         } catch(Exception e) {
diff --git a/src/ios/OrtcPushPlugin.h b/src/ios/OrtcPushPlugin.h
@@ -26,5 +26,7 @@
 - (void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;
 - (void)cancelAllLocalNotifications:(CDVInvokedUrlCommand*)command;
 - (void)log:(CDVInvokedUrlCommand*)command;
+- (void)enableHeadsUpNotifications:(CDVInvokedUrlCommand*)command;
+- (void)disableHeadsUpNotifications:(CDVInvokedUrlCommand*)command;
 
 @end
diff --git a/src/ios/OrtcPushPlugin.m b/src/ios/OrtcPushPlugin.m
@@ -169,6 +169,14 @@ - (void)log:(CDVInvokedUrlCommand*)command
     NSLog(@"OrtcPushPlugin: %@",[command.arguments objectAtIndex:0]);
 }
 
+- (void)enableHeadsUpNotifications:(CDVInvokedUrlCommand*)command{
+
+}
+
+- (void)disableHeadsUpNotifications:(CDVInvokedUrlCommand*)command{
+    
+}
+
 @end
 
 
diff --git a/www/OrtcPlugin.js b/www/OrtcPlugin.js
@@ -1,92 +1,96 @@
 (function(cordova) {
  
- function OrtcPushPlugin() {}
+  function OrtcPushPlugin() {}
  
  
- OrtcPushPlugin.prototype.checkForNotifications = function(success) {
+  OrtcPushPlugin.prototype.checkForNotifications = function(success) {
    cordova.exec(success, success, "OrtcPushPlugin", "checkForNotifications", []);
- };
- 
- OrtcPushPlugin.prototype.removeNotifications = function(success) {
+  };
+
+  OrtcPushPlugin.prototype.removeNotifications = function(success) {
    cordova.exec(success, success, "OrtcPushPlugin", "removeNotifications", []);
- };
- 
- OrtcPushPlugin.prototype.connect = function(config, success) {
+  };
+
+  OrtcPushPlugin.prototype.connect = function(config, success) {
    cordova.exec(success, success, "OrtcPushPlugin", "connect", config ? [config] : []);
- };
- 
- OrtcPushPlugin.prototype.disconnect = function(success) {
+  };
+
+  OrtcPushPlugin.prototype.enableHeadsUpNotifications = function(config, success) {
+    cordova.exec(success, success, "OrtcPushPlugin", "enableHeadsUpNotifications", []);
+  };
+
+  OrtcPushPlugin.prototype.disableHeadsUpNotifications = function(config, success) {
+    cordova.exec(success, success, "OrtcPushPlugin", "disableHeadsUpNotifications", []);
+  };
+   
+  OrtcPushPlugin.prototype.disconnect = function(success) {
    cordova.exec(success, success, "OrtcPushPlugin", "disconnect", []);
- };
- 
- OrtcPushPlugin.prototype.subscribe = function(config, success) {
+  };
+
+  OrtcPushPlugin.prototype.subscribe = function(config, success) {
    cordova.exec(success, success, "OrtcPushPlugin", "subscribe", config ? [config] : []);
- };
- 
- 
- OrtcPushPlugin.prototype.unsubscribe = function(config, success) {
+  };
+
+
+  OrtcPushPlugin.prototype.unsubscribe = function(config, success) {
    cordova.exec(success, success, "OrtcPushPlugin", "unsubscribe", config ? [config] : []);
- };
- 
- OrtcPushPlugin.prototype.setApplicationIconBadgeNumber = function(badge, callback) {
+  };
+
+  OrtcPushPlugin.prototype.setApplicationIconBadgeNumber = function(badge, callback) {
    cordova.exec(callback, callback, "OrtcPushPlugin", "setApplicationIconBadgeNumber", [badge]);
- };
- 
- OrtcPushPlugin.prototype.send = function(config) {
+  };
+
+  OrtcPushPlugin.prototype.send = function(config) {
    cordova.exec(null, null, "OrtcPushPlugin", "send", config ? [config] : []);
- };
- 
- // Call this to clear all notifications from the notification center
- OrtcPushPlugin.prototype.cancelAllLocalNotifications = function(callback) {
+  };
+
+  // Call this to clear all notifications from the notification center
+  OrtcPushPlugin.prototype.cancelAllLocalNotifications = function(callback) {
    cordova.exec(callback, callback, "OrtcPushPlugin", "cancelAllLocalNotifications", []);
- };
- 
- OrtcPushPlugin.prototype.log = function(log) {
+  };
+
+  OrtcPushPlugin.prototype.log = function(log) {
    cordova.exec(null, null, "OrtcPushPlugin", "log", log ? [log] : []);
- };
- 
- OrtcPushPlugin.prototype.receiveRemoteNotification = function(channel, payload) {
+  };
+
+  OrtcPushPlugin.prototype.receiveRemoteNotification = function(channel, payload) {
     var ev = document.createEvent('HTMLEvents');
     ev.channel = channel;
     ev.payload = payload;
     ev.initEvent('push-notification', true, true, arguments);
     document.dispatchEvent(ev);
- };
+  };
 
- OrtcPushPlugin.prototype.onException = function(error){
+  OrtcPushPlugin.prototype.onException = function(error){
     var ev = document.createEvent('HTMLEvents');
     ev.description = error;
     ev.initEvent('onException', true, true, arguments);
     document.dispatchEvent(ev);
- };
- 
- cordova.addConstructor(function() {
+  };
+
+  cordova.addConstructor(function() {
                            if(!window.plugins) window.plugins = {};
                            window.plugins.OrtcPushPlugin = new OrtcPushPlugin();
                         });
- 
- })(window.cordova || window.Cordova || window.PhoneGap);
- 
- 
- // call when device is ready
- document.addEventListener("deviceready", function () {
-                           if(window.plugins && window.plugins.OrtcPushPlugin){
-                           var OrtcPushPlugin = window.plugins.OrtcPushPlugin;
-                           OrtcPushPlugin.checkForNotifications();
-
-                           }
-                           });
- 
- 
- // call when app resumes
- document.addEventListener("resume", function () {
-                           if(window.plugins && window.plugins.OrtcPushPlugin){
-                           var OrtcPushPlugin = window.plugins.OrtcPushPlugin;
-                           OrtcPushPlugin.checkForNotifications();
-                           }
-                           });
 
+})(window.cordova || window.Cordova || window.PhoneGap);
+
+
+// call when device is ready
+document.addEventListener("deviceready", function () {
+                         if(window.plugins && window.plugins.OrtcPushPlugin){
+                         var OrtcPushPlugin = window.plugins.OrtcPushPlugin;
+                         OrtcPushPlugin.checkForNotifications();
 
+                         }
+                         });
 
 
+// call when app resumes
+document.addEventListener("resume", function () {
+                         if(window.plugins && window.plugins.OrtcPushPlugin){
+                         var OrtcPushPlugin = window.plugins.OrtcPushPlugin;
+                         OrtcPushPlugin.checkForNotifications();
+                         }
+                         });
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cordovapush",`
`3`		`- "version": "0.1.25",`
	`3`	`+ "version": "0.1.26",`
`4`	`4`	`"description": "This Cordova plugin should be used with the iOS/Android platforms together with the Realtime Messaging library (ORTC) for Push Notifications support.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`