Skip to content

Commit 595e762

Browse files
bobeastbobeast
committed
Add cold-start functionality
1 parent 86bec0e commit 595e762

File tree

8 files changed

+185
-117
lines changed

8 files changed

+185
-117
lines changed

‎Example/Sample_AndroidManifest.xml

-2
This file was deleted.

‎Example/Sample_config.xml

-29
This file was deleted.

‎Example/www/PushNotification.js

+49-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,65 @@
1-
(function(cordova) {
2-
var cordovaRef = window.PhoneGap || window.Cordova || window.cordova;
31

4-
function PushNotification() {}
2+
var PushNotification = function() {
3+
};
4+
55

66
// Call this to register for push notifications. Content of [options] depends on whether we are working with APNS (iOS) or GCM (Android)
77
PushNotification.prototype.register = function(successCallback, errorCallback, options) {
8-
cordovaRef.exec(successCallback, errorCallback, "PushPlugin", "register", [options]);
8+
if (errorCallback == null) { errorCallback = function() {}}
9+
10+
if (typeof errorCallback != "function") {
11+
console.log("PushNotification.register failure: failure parameter not a function");
12+
return;
13+
}
14+
15+
if (typeof successCallback != "function") {
16+
console.log("PushNotification.register failure: success callback parameter must be a function");
17+
return;
18+
}
19+
20+
cordova.exec(successCallback, errorCallback, "PushPlugin", "register", [options]);
921
};
1022

1123
// Call this to unregister for push notifications
1224
PushNotification.prototype.unregister = function(successCallback, errorCallback) {
13-
cordovaRef.exec(successCallback, errorCallback, "PushPlugin", "unregister", []);
25+
if (errorCallback == null) { errorCallback = function() {}}
26+
27+
if (typeof errorCallback != "function") {
28+
console.log("PushNotification.unregister failure: failure parameter not a function");
29+
return;
30+
}
31+
32+
if (typeof successCallback != "function") {
33+
console.log("PushNotification.unregister failure: success callback parameter must be a function");
34+
return;
35+
}
36+
37+
cordova.exec(successCallback, errorCallback, "PushPlugin", "unregister", []);
1438
};
1539

1640

1741
// Call this to set the application icon badge
1842
PushNotification.prototype.setApplicationIconBadgeNumber = function(successCallback, badge) {
19-
cordovaRef.exec(successCallback, successCallback, "PushPlugin", "setApplicationIconBadgeNumber", [{badge: badge}]);
43+
if (errorCallback == null) { errorCallback = function() {}}
44+
45+
if (typeof errorCallback != "function") {
46+
console.log("PushNotification.setApplicationIconBadgeNumber failure: failure parameter not a function");
47+
return;
48+
}
49+
50+
if (typeof successCallback != "function") {
51+
console.log("PushNotification.setApplicationIconBadgeNumber failure: success callback parameter must be a function");
52+
return;
53+
}
54+
55+
cordova.exec(successCallback, successCallback, "PushPlugin", "setApplicationIconBadgeNumber", [{badge: badge}]);
2056
};
2157

22-
cordova.addConstructor(function() {
23-
if(!window.plugins)
24-
window.plugins = {};
25-
window.plugins.pushNotification = new PushNotification();
26-
});
58+
//-------------------------------------------------------------------
2759

28-
})(window.cordova || window.Cordova || window.PhoneGap);
60+
if(!window.plugins) {
61+
window.plugins = {};
62+
}
63+
if (!window.plugins.pushNotification) {
64+
window.plugins.pushNotification = new PushNotification();
65+
}

‎Example/www/index.html

+17-23
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222

2323
if( $("#home").length > 0)
2424
{
25+
// call this to get a new token each time. don't call it to reuse existing token.
26+
//pushNotification.unregister(successHandler, errorHandler);
2527
e.preventDefault();
26-
pushNotification.unregister(successHandler, errorHandler);
2728
navigator.app.exitApp();
2829
}
2930
else
@@ -37,10 +38,10 @@
3738
pushNotification = window.plugins.pushNotification;
3839
if (device.platform == 'android' || device.platform == 'Android') {
3940
$("#app-status-ul").append('<li>registering android</li>');
40-
pushNotification.register(successHandler, errorHandler, {"senderID":"661780372179","ecb":"onNotificationGCM"});
41+
pushNotification.register(successHandler, errorHandler, {"senderID":"661780372179","ecb":"onNotificationGCM"}); // required!
4142
} else {
4243
$("#app-status-ul").append('<li>registering iOS</li>');
43-
pushNotification.register(tokenHandler, errorHandler, {"badge":"true","sound":"true","alert":"true","ecb":"onNotificationAPN"});
44+
pushNotification.register(tokenHandler, errorHandler, {"badge":"true","sound":"true","alert":"true","ecb":"onNotificationAPN"}); // required!
4445
}
4546
}
4647
catch(err)
@@ -53,25 +54,14 @@
5354

5455
// handle APNS notifications for iOS
5556
function onNotificationAPN(e) {
56-
if (e.foreground) {
57-
$("#app-status-ul").append('<li>--INLINE NOTIFICATION--' + '</li>');
58-
59-
if (e.sound) {
60-
var snd = new Media(e.sound);
61-
snd.play();
62-
}
63-
64-
if (e.alert) {
65-
$("#app-status-ul").append('<li>push-notification: ' + e.alert + '</li>');
66-
navigator.notification.alert(e.alert);
67-
}
57+
if (e.alert) {
58+
$("#app-status-ul").append('<li>push-notification: ' + e.alert + '</li>');
59+
navigator.notification.alert(e.alert);
6860
}
69-
else {
70-
$("#app-status-ul").append('<li>--BACKGROUND NOTIFICATION--' + '</li>');
7161

72-
if (e.alert) {
73-
$("#app-status-ul").append('<li>push-notification: ' + e.alert + '</li>');
74-
}
62+
if (e.sound) {
63+
var snd = new Media(e.sound);
64+
snd.play();
7565
}
7666

7767
if (e.badge) {
@@ -89,9 +79,9 @@
8979
if ( e.regid.length > 0 )
9080
{
9181
$("#app-status-ul").append('<li>REGISTERED -> REGID:' + e.regid + "</li>");
92-
console.log("regID = " + e.regID);
9382
// Your GCM push server needs to know the regID before it can push to this device
9483
// here is where you might want to send it the regID for later use.
84+
console.log("regID = " + e.regID);
9585
}
9686
break;
9787

@@ -106,8 +96,13 @@
10696
var my_media = new Media("/android_asset/www/"+e.soundname);
10797
my_media.play();
10898
}
109-
else // otherwise we were launched because the user touched a notification in the notification tray.
99+
else
100+
{ // otherwise we were launched because the user touched a notification in the notification tray.
101+
if (e.coldstart)
102+
$("#app-status-ul").append('<li>--COLDSTART NOTIFICATION--' + '</li>');
103+
else
110104
$("#app-status-ul").append('<li>--BACKGROUND NOTIFICATION--' + '</li>');
105+
}
111106

112107
$("#app-status-ul").append('<li>MESSAGE -> MSG: ' + e.payload.message + '</li>');
113108
$("#app-status-ul").append('<li>MESSAGE -> MSGCNT: ' + e.payload.msgcnt + '</li>');
@@ -125,7 +120,6 @@
125120

126121
function tokenHandler (result) {
127122
$("#app-status-ul").append('<li>token: '+ result +'</li>');
128-
console.log("token = " + result);
129123
// Your iOS push server needs to know the token before it can push to this device
130124
// here is where you might want to send it the token for later use.
131125
}

‎plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
id="com.adobe.plugins.PushPlugin"
5-
version="1.1.3">
5+
version="1.2.0">
66

77
<name>PushPlugin</name>
88

‎src/android/com/google/android/gcm/GCMIntentService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public boolean isInForeground()
138138
List<RunningTaskInfo> services = activityManager
139139
.getRunningTasks(Integer.MAX_VALUE);
140140

141-
if (services.get(0).topActivity.getPackageName().toString()
142-
.equalsIgnoreCase(getApplicationContext().getPackageName().toString()))
141+
if (services.get(0).topActivity.getPackageName().toString().equalsIgnoreCase(getApplicationContext().getPackageName().toString()))
143142
return true;
144143

145144
return false;

‎src/android/com/plugin/GCM/PushHandlerActivity.java

+66-28
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
//
22
// PushHandlerActivity.java
33
//
4-
// Pushwoosh Push Notifications SDK
5-
// www.pushwoosh.com
6-
//
7-
// MIT Licensed
84

95
package com.plugin.GCM;
106

7+
import java.io.FileOutputStream;
118
import java.util.Iterator;
129

1310
import org.json.JSONArray;
@@ -18,46 +15,83 @@
1815
import android.app.NotificationManager;
1916
import android.content.Context;
2017
import android.content.Intent;
18+
import android.content.pm.PackageManager;
2119
import android.os.Bundle;
2220
import android.util.Log;
2321

2422
public class PushHandlerActivity extends Activity
2523
{
2624
public static final int NOTIFICATION_ID = 237;
25+
public static boolean EXITED = false;
2726

27+
// this activity will be started if the user touches a notification that we own. If returning from the background,
28+
// we process it immediately. If from a cold start, we cache the payload and start the main activity which will then process the cached payload.
2829
@Override
2930
public void onCreate(Bundle savedInstanceState)
3031
{
32+
Log.v("onCreate:", "entry");
33+
3134
super.onCreate(savedInstanceState);
32-
handlePush();
33-
}
3435

35-
private void handlePush()
36-
{
37-
// If we are here, it is because we were launched via a notification. It is up to the author to decide what to do with it.
38-
// You may simply ignore it since the notification already fired in the background. Either way, the background flag
39-
// will let you know what the state was when the notification fired.
40-
Bundle extras = this.getIntent().getExtras();
36+
Bundle extras = getIntent().getExtras();
4137
if (extras != null)
4238
{
4339
Bundle originalExtras = extras.getBundle("pushBundle");
4440
if (originalExtras != null)
45-
PushHandlerActivity.sendToApp(originalExtras);
46-
}
47-
finish();
41+
{
42+
if (EXITED)
43+
{
44+
PackageManager pm = getPackageManager();
45+
Intent launchIntent = pm.getLaunchIntentForPackage(getApplicationContext().getPackageName());
46+
47+
// remember how we got here
48+
originalExtras.putBoolean("coldstart", true);
49+
50+
// serialize and cache the payload before starting the main activity.
51+
String json = extrasToJSON(originalExtras).toString();
52+
try
53+
{
54+
FileOutputStream fos = openFileOutput("cached_payload", Context.MODE_PRIVATE);
55+
fos.write(json.getBytes());
56+
fos.close();
57+
}
58+
catch (Exception e)
59+
{
60+
e.printStackTrace();
61+
}
4862

49-
// Now that we've processed the notification, remove it from the tray
50-
CharSequence appName = this.getPackageManager().getApplicationLabel(this.getApplicationInfo());
51-
if (null == appName)
52-
appName = "";
63+
// now fire up our main activity
64+
startActivity(launchIntent);
65+
}
66+
else
67+
{
68+
// our main activity was already running (in the background), process the payload
69+
sendToApp(originalExtras);
70+
}
71+
72+
// Now that we've processed the notification, remove it from the tray
73+
CharSequence appName = this.getPackageManager().getApplicationLabel(this.getApplicationInfo());
74+
if (null == (String)appName)
75+
appName = "";
5376

54-
NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
55-
// use a combo of appName and id to insure uniqueness since this plugin may be running
56-
// in multiple apps on a particular device.
57-
mNotificationManager.cancel((String) appName, NOTIFICATION_ID);
58-
}
77+
NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
78+
mNotificationManager.cancel((String) appName, NOTIFICATION_ID);
79+
}
80+
}
81+
82+
finish();
83+
}
5984

85+
// surface the notification up to the JS layer
6086
public static void sendToApp(Bundle extras)
87+
{
88+
JSONObject json = extrasToJSON(extras);
89+
90+
PushPlugin.sendJavascript( json );
91+
}
92+
93+
// serialize the bundle for caching or JS processing
94+
private static JSONObject extrasToJSON(Bundle extras)
6195
{
6296
try
6397
{
@@ -80,6 +114,10 @@ else if (key.equals("foreground"))
80114
{
81115
json.put(key, extras.getBoolean("foreground"));
82116
}
117+
else if (key.equals("coldstart"))
118+
{
119+
json.put(key, extras.getBoolean("coldstart"));
120+
}
83121
else
84122
{
85123
// Maintain backwards compatibility
@@ -122,15 +160,15 @@ else if (value.startsWith("["))
122160
} // while
123161
json.put("payload", jsondata);
124162

125-
Log.v("sendToApp:", json.toString());
163+
Log.v("extrasToJSON:", json.toString());
126164

127-
PushPlugin.sendJavascript( json );
128-
// Send the MESSAGE to the Javascript application
165+
return json;
129166
}
130167
catch( JSONException e)
131168
{
132-
Log.e("sendToApp:", "JSON exception");
169+
Log.e("extrasToJSON:", "JSON exception");
133170
}
171+
return null;
134172
}
135173

136174
@Override

0 commit comments

Comments
 (0)