reset incoming push data after getIncoming is called

urbanairship · Dec 7, 2012 · 1112b76 · 1112b76
1 parent 998285b
commit 1112b76
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/android-sample/src/com/urbanairship/phonegap/plugins/PushNotificationPlugin.java b/android-sample/src/com/urbanairship/phonegap/plugins/PushNotificationPlugin.java
@@ -146,6 +146,9 @@ public PluginResult execute(String action, JSONArray data, String callbackId) {
             Map<String, String> extras = PushNotificationPlugin.incomingExtras;
             JSONObject obj = notificationObject(alert, extras);
             result = new PluginResult(Status.OK, obj);
+            //reset incoming push data until the next background push comes in
+            PushNotificationPlugin.incomingAlert = "";
+            PushNotificationPlugin.incomingExtras = new HashMap<String,String>();
         } else if (action.equals("getPushID")) {
             String pushID = PushManager.shared().getAPID();
             pushID = pushID != null ? pushID : "";

diff --git a/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/PushNotificationPlugin.m b/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/PushNotificationPlugin.m
@@ -365,6 +365,9 @@ - (void)getIncoming:(NSMutableArray *)args withDict:(NSMutableDictionary *)optio
 
         [returnDictionary setObject:incomingAlert forKey:@"message"];
         [returnDictionary setObject:incomingExtras forKey:@"extras"];
+
+        //reset incoming push data until the next background push comes in
+        [[UAAppDelegateSurrogate shared] clearLaunchOptions];
 
         return returnDictionary;
     }];

diff --git a/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/UAAppDelegateSurrogate.h b/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/UAAppDelegateSurrogate.h
@@ -21,4 +21,6 @@ SINGLETON_INTERFACE(UAAppDelegateSurrogate);
 @property(nonatomic, assign) NSObject<UIApplicationDelegate> *defaultAppDelegate;
 @property(nonatomic, readonly, copy) NSDictionary *launchOptions;
 
+- (void)clearLaunchOptions;
+
 @end
diff --git a/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/UAAppDelegateSurrogate.m b/ios-sample/UAPhonegapSample/Plugins/PushNotificationPlugin/UAAppDelegateSurrogate.m
@@ -44,6 +44,10 @@ initial delegate does appear to be released (deallocated) when a new delegate
     [UAPush setDefaultPushEnabledValue:NO];
 }
 
+- (void)clearLaunchOptions {
+    self.launchOptions = nil;
+}
+
 #pragma mark Message forwarding
 
 - (void)forwardInvocation:(NSInvocation *)invocation {