From d3bf39535c7e0f38857002176c506a91722b299b Mon Sep 17 00:00:00 2001
From: Adrien Navratil <adrien1975@live.fr>
Date: Sun, 2 Dec 2018 22:07:12 +0100
Subject: [PATCH] Trying to get hybrid iOS/Android notification

---
 .../litarvan/sakado/server/SakadoServer.java  |  2 ++
 .../sakado/server/push/PushService.java       | 25 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/litarvan/sakado/server/SakadoServer.java b/src/main/java/fr/litarvan/sakado/server/SakadoServer.java
index b2998fd..6835e85 100644
--- a/src/main/java/fr/litarvan/sakado/server/SakadoServer.java
+++ b/src/main/java/fr/litarvan/sakado/server/SakadoServer.java
@@ -46,6 +46,8 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
+// TODO: Menu de la cantine + sauvegarde connexion
+
 public class SakadoServer implements App
 {
     public static final String VERSION = "1.4.1-BETA";
diff --git a/src/main/java/fr/litarvan/sakado/server/push/PushService.java b/src/main/java/fr/litarvan/sakado/server/push/PushService.java
index ddcba43..bfc1b2e 100644
--- a/src/main/java/fr/litarvan/sakado/server/push/PushService.java
+++ b/src/main/java/fr/litarvan/sakado/server/push/PushService.java
@@ -85,7 +85,7 @@ public void send(User user, String type, String title, String message, String co
         conn.setRequestMethod("POST");
         conn.setDoOutput(true);
 
-        JsonObject data = new JsonObject();
+        /*JsonObject data = new JsonObject();
         data.addProperty("title", "Sakado - " + title);
         data.addProperty("message", message);
         data.addProperty("priority", "high");
@@ -103,15 +103,30 @@ public void send(User user, String type, String title, String message, String co
         if (type != null)
         {
             data.addProperty("type", type);
-        }
+        }*/
 
         JsonObject notification = new JsonObject();
-        notification.addProperty("body", title);
-        notification.addProperty("title", message);
+        notification.addProperty("title", "Sakado - " + title);
+        notification.addProperty("body", message);
+
+        if (color != null)
+        {
+            notification.addProperty("color", color);
+        }
+
+        if (icon != null)
+        {
+            notification.addProperty("icon", icon);
+        }
+
+        if (type != null)
+        {
+            notification.addProperty("type", type);
+        }
 
         JsonObject request = new JsonObject();
         request.addProperty("to", user.getDeviceToken());
-        request.add("data", data);
+        //request.add("data", data);
         request.add("notification", notification);
 
         String requestContent = gson.toJson(request);