diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 2bc3b5b..903a7ee 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 06f1423..9bf284c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,4 +41,6 @@ dependencies { implementation 'com.github.danielnilsson9:color-picker-view:1.4.0@aar' implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'com.android.support:support-v4:28.0.0' + implementation 'cz.msebera.android:httpclient:4.4.1.2' + } diff --git a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java b/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java index 9017f7b..c4f058c 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java +++ b/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java @@ -1,13 +1,23 @@ package at.smartshopper.smartshopper.messaging; +import android.util.Log; + import com.google.firebase.messaging.FirebaseMessaging; import com.google.firebase.messaging.RemoteMessage; + import java.util.ArrayList; import java.util.List; import at.smartshopper.smartshopper.R; import at.smartshopper.smartshopper.shoppinglist.Member; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.NameValuePair; +import cz.msebera.android.httpclient.client.HttpClient; +import cz.msebera.android.httpclient.client.entity.UrlEncodedFormEntity; +import cz.msebera.android.httpclient.client.methods.HttpPost; +import cz.msebera.android.httpclient.impl.client.DefaultHttpClient; +import cz.msebera.android.httpclient.message.BasicNameValuePair; public class MyFirebaseSender { @@ -32,11 +42,24 @@ public class MyFirebaseSender { FirebaseMessaging firebaseMessaging = FirebaseMessaging.getInstance(); for (int i = 0; messageIds.size() > i; i++) { - firebaseMessaging.send(new RemoteMessage.Builder(R.string.firebase_sender_id + "@fcm.googleapis.com/fcm/send") - .setMessageId(messageIds.get(i)) - .addData("my_message", message) - .addData("my_action", action) - .build()); + try { + firebaseMessaging.send(new RemoteMessage.Builder(R.string.firebase_sender_id + "@fcm.googleapis.com/fcm/") + .setMessageId(messageIds.get(i)) + .addData("my_message", message) + .addData("LoginActivity", action) + .build()); + + // Create a new HttpClient and Post Header + HttpClient httpclient = new DefaultHttpClient(); + HttpPost httppost = new HttpPost("https://www.smartshopper.cf/push/" + messageIds.get(i)); + + // Execute HTTP Post Request + HttpResponse response = httpclient.execute(httppost); + Log.d(R.string.StringTag + "", "Response Push Post" + response); + + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5de851..46cd954 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,5 @@ ShoppinglistDetails ItemListActivity 221332577314 + SmartShopper