Merge pull request #600 from phonegap-build/raghav/wp8fix

rakatyal · rakatyal · commit 534a6e39fb18 · 2015-07-17T11:17:58.000-07:00
[WP8] Updating docs and fixing the first registeration issue
diff --git a/README.md b/README.md
@@ -545,14 +545,15 @@ if(device.platform == "Win32NT"){
         channelHandler,
         errorHandler,
         {
-            "channelName": channelName,
-            "ecb": "onNotificationWP8",
-            "uccb": "channelHandler",
-            "errcb": "jsonErrorHandler"
+            "channelName": "channelName",
+            "ecb": onNotificationWP8,
+            "uccb": channelHandler,
+            "errcb": jsonErrorHandler
         });
 }
 
 ```
+Make sure that date and time settings are correct for your device/emulator before registering for push notifications.
 
 #### channelHandler (WP8 only)
 Called after a push notification channel is opened and push notification URI is returned. [The application is now set to receive notifications.](http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh202940(v=vs.105).aspx)
diff --git a/src/wp8/PushPlugin.cs b/src/wp8/PushPlugin.cs
@@ -29,10 +29,15 @@ public void register(string options)
             if (pushChannel == null)
             {
                 pushChannel = new HttpNotificationChannel(this.pushOptions.ChannelName);
-
+                SubscribePushChannelEvents(pushChannel);
                 try
                 {
-                    pushChannel.Open();
+                    var count = 0;
+                    while(count < 3 && pushChannel.ChannelUri == null)
+                    {
+                        pushChannel.Open();
+                        count++;
+                    }
                 }
                 catch (InvalidOperationException)
                 {
@@ -43,8 +48,10 @@ public void register(string options)
                 pushChannel.BindToShellToast();
                 pushChannel.BindToShellTile();
             }
-
-            SubscribePushChannelEvents(pushChannel);
+            else
+            {
+                SubscribePushChannelEvents(pushChannel);
+            }
             var result = new RegisterResult
             {
                 ChannelName = this.pushOptions.ChannelName,

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,15 @@ public void register(string options)`
`29`	`29`	`if (pushChannel == null)`
`30`	`30`	`{`
`31`	`31`	`pushChannel = new HttpNotificationChannel(this.pushOptions.ChannelName);`
`32`		`-`
	`32`	`+ SubscribePushChannelEvents(pushChannel);`
`33`	`33`	`try`
`34`	`34`	`{`
`35`		`- pushChannel.Open();`
	`35`	`+ var count = 0;`
	`36`	`+ while(count < 3 && pushChannel.ChannelUri == null)`
	`37`	`+ {`
	`38`	`+ pushChannel.Open();`
	`39`	`+ count++;`
	`40`	`+ }`
`36`	`41`	`}`
`37`	`42`	`catch (InvalidOperationException)`
`38`	`43`	`{`
`@@ -43,8 +48,10 @@ public void register(string options)`
`43`	`48`	`pushChannel.BindToShellToast();`
`44`	`49`	`pushChannel.BindToShellTile();`
`45`	`50`	`}`
`46`		`-`
`47`		`- SubscribePushChannelEvents(pushChannel);`
	`51`	`+ else`
	`52`	`+ {`
	`53`	`+ SubscribePushChannelEvents(pushChannel);`
	`54`	`+ }`
`48`	`55`	`var result = new RegisterResult`
`49`	`56`	`{`
`50`	`57`	`ChannelName = this.pushOptions.ChannelName,`