From 0742f29be4999244d74a11da8b62ed05099fef09 Mon Sep 17 00:00:00 2001
From: Gabriel Prado <gabriel.prado@coffeebeantech.com>
Date: Mon, 6 Jul 2015 18:16:46 -0300
Subject: [PATCH] Avoid public exported activity

See:
https://code.google.com/p/android/issues/detail?id=61850
https://code.google.com/p/android/issues/detail?id=63236
http://stackoverflow.com/questions/21250364/notification-click-not-launch-the-given-activity-on-nexus-phones
---
 plugin.xml                                       | 2 +-
 src/android/com/plugin/gcm/GCMIntentService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 68a46ff3..65a58c38 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -47,7 +47,7 @@
 		</config-file>
 
 		<config-file target="AndroidManifest.xml" parent="/manifest/application">
-			<activity android:name="com.plugin.gcm.PushHandlerActivity" android:exported="true"/>
+			<activity android:name="com.plugin.gcm.PushHandlerActivity"/>
 			<receiver android:name="com.plugin.gcm.CordovaGCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
 				<intent-filter>
 					<action android:name="com.google.android.c2dm.intent.RECEIVE" />
diff --git a/src/android/com/plugin/gcm/GCMIntentService.java b/src/android/com/plugin/gcm/GCMIntentService.java
index caee145e..10c5e5b3 100644
--- a/src/android/com/plugin/gcm/GCMIntentService.java
+++ b/src/android/com/plugin/gcm/GCMIntentService.java
@@ -88,7 +88,7 @@ public void createNotification(Context context, Bundle extras)
 		notificationIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 		notificationIntent.putExtra("pushBundle", extras);
 
-		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
 		
 		int defaults = Notification.DEFAULT_ALL;