From d8089ad0bb0253afade592ea333b45ece2c127df Mon Sep 17 00:00:00 2001
From: Armin Felder <armin.felder@osalliance.com>
Date: Sun, 1 Jul 2018 16:13:49 +0200
Subject: [PATCH 1/2] firebase api fix

---
 models/ApplePushModel.cpp  | 4 ++--
 models/GooglePushModel.cpp | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/models/ApplePushModel.cpp b/models/ApplePushModel.cpp
index 21bd6a4..e3eeeee 100644
--- a/models/ApplePushModel.cpp
+++ b/models/ApplePushModel.cpp
@@ -191,8 +191,8 @@ bool ApplePushModel::sendMessage() {
 }
 
 void ApplePushModel::loadApiKey() {
-    std::ifstream ifsPem("/certs/apple/key.pem");
-    std::ifstream ifsSettings("/certs/apple/settings.json");
+    std::ifstream ifsPem("/home/armin/certs/apple/key.pem");
+    std::ifstream ifsSettings("/home/armin/certs/apple/settings.json");
     std::string pemContent((std::istreambuf_iterator<char>(ifsPem)),(std::istreambuf_iterator<char>()));
     std::string settingsContent((std::istreambuf_iterator<char>(ifsSettings)),(std::istreambuf_iterator<char>()));
     if(pemContent.length()&&settingsContent.length()){
diff --git a/models/GooglePushModel.cpp b/models/GooglePushModel.cpp
index 1812803..cf5fb44 100644
--- a/models/GooglePushModel.cpp
+++ b/models/GooglePushModel.cpp
@@ -39,7 +39,8 @@
 std::string GooglePushModel::mApiKey;
 
 void GooglePushModel::loadApiKey() {
-    std::ifstream ifs("/certs/google/serverKey.txt");
+    //std::ifstream ifs("/certs/google/serverKey.txt");
+    std::ifstream ifs("/home/armin/certs/google/serverKey.txt");
     std::string content((std::istreambuf_iterator<char>(ifs)),
                         (std::istreambuf_iterator<char>()));
     if(content.length()){
@@ -155,12 +156,13 @@ bool GooglePushModel::sendMessage() {
     Json::Value msg;
     msg["title"] = mTitle;
     msg["body"] = mText;
-    msg["message"] = mGcm;
+    msg["message"] = mText;
     msg["ejson"] = mPayload;
     msg["msgcnt"] = mBadge;
 
     obj["to"] = mDeviceToken;
-    obj["notification"] = msg;
+    obj["data"] = msg;
+    obj["priority"] = 10;
 
     Json::FastWriter fast;
 
-- 
GitLab


From fbeaef5ec8d9d463d3b0028c2469040c9c43bdfe Mon Sep 17 00:00:00 2001
From: Armin Felder <armin.felder@osalliance.com>
Date: Sun, 1 Jul 2018 16:16:15 +0200
Subject: [PATCH 2/2] fixed path

---
 models/ApplePushModel.cpp  | 4 ++--
 models/GooglePushModel.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/models/ApplePushModel.cpp b/models/ApplePushModel.cpp
index e3eeeee..21bd6a4 100644
--- a/models/ApplePushModel.cpp
+++ b/models/ApplePushModel.cpp
@@ -191,8 +191,8 @@ bool ApplePushModel::sendMessage() {
 }
 
 void ApplePushModel::loadApiKey() {
-    std::ifstream ifsPem("/home/armin/certs/apple/key.pem");
-    std::ifstream ifsSettings("/home/armin/certs/apple/settings.json");
+    std::ifstream ifsPem("/certs/apple/key.pem");
+    std::ifstream ifsSettings("/certs/apple/settings.json");
     std::string pemContent((std::istreambuf_iterator<char>(ifsPem)),(std::istreambuf_iterator<char>()));
     std::string settingsContent((std::istreambuf_iterator<char>(ifsSettings)),(std::istreambuf_iterator<char>()));
     if(pemContent.length()&&settingsContent.length()){
diff --git a/models/GooglePushModel.cpp b/models/GooglePushModel.cpp
index cf5fb44..e3cb99b 100644
--- a/models/GooglePushModel.cpp
+++ b/models/GooglePushModel.cpp
@@ -39,8 +39,7 @@
 std::string GooglePushModel::mApiKey;
 
 void GooglePushModel::loadApiKey() {
-    //std::ifstream ifs("/certs/google/serverKey.txt");
-    std::ifstream ifs("/home/armin/certs/google/serverKey.txt");
+    std::ifstream ifs("/certs/google/serverKey.txt");
     std::string content((std::istreambuf_iterator<char>(ifs)),
                         (std::istreambuf_iterator<char>()));
     if(content.length()){
-- 
GitLab