Added topic subscription/unsubscription

src/android/com/adobe/phonegap/push/GCMIntentService.java

@@ -61,8 +61,15 @@ public void setNotification(int notId, String message){
 
  @Override
  public void onMessageReceived(RemoteMessage message){
+
  Log.d(LOG_TAG, "onMessage - from: " + message.getFrom());
+
  Bundle extras = new Bundle();
+
+ if (message.getNotification()!=null) {
+ extras.putString(TITLE,message.getNotification().getTitle());
+ extras.putString(MESSAGE,message.getNotification().getBody());
+ }
  for (Map.Entry<String, String> entry : message.getData().entrySet()) {
  extras.putString(entry.getKey(), entry.getValue());
  }

src/android/com/adobe/phonegap/push/PushPlugin.java

@@ -7,6 +7,7 @@
 import android.util.Log;
 
 import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
@@ -270,15 +271,11 @@ private void subscribeToTopics(JSONArray topics, String registrationToken) {
  if (topics != null) {
  String topic = null;
  for (int i=0; i<topics.length(); i++) {
- // try {
- topic = topics.optString(i, null);
- if (topic != null) {
- Log.d(LOG_TAG, "Subscribing to topic: " + topic);
- //GcmPubSub.getInstance(getApplicationContext()).subscribe(registrationToken, "/topics/" + topic, null);
- }
- // } catch (IOException e) {
- // Log.e(LOG_TAG, "Failed to subscribe to topic: " + topic, e);
- //}
+ topic = topics.optString(i, null);
+ if (topic != null) {
+ Log.d(LOG_TAG, "Subscribing to topic: " + topic);
+ FirebaseMessaging.getInstance().subscribeToTopic(topic);
+ }
  }
  }
  }
@@ -287,15 +284,12 @@ private void unsubscribeFromTopics(JSONArray topics, String registrationToken) {
  if (topics != null) {
  String topic = null;
  for (int i=0; i<topics.length(); i++) {
- // try {
- topic = topics.optString(i, null);
- if (topic != null) {
- Log.d(LOG_TAG, "Unsubscribing to topic: " + topic);
- //GcmPubSub.getInstance(getApplicationContext()).unsubscribe(registrationToken, "/topics/" + topic);
- }
- // } catch (IOException e) {
- // Log.e(LOG_TAG, "Failed to unsubscribe to topic: " + topic, e);
- // }
+ topic = topics.optString(i, null);
+ if (topic != null) {
+ Log.d(LOG_TAG, "Unsubscribing to topic: " + topic);
+ FirebaseMessaging.getInstance().unsubscribeFromTopic(topic);
+
+ }
  }
  }
  }