stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add null assert

Browse Source
This commit is contained in:
stubbfel
2013-11-18 11:37:07 +01:00
parent df6dac4944
commit cea07ff526
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
View File

@@ -175,7 +175,10 @@ namespace CampusAppWP8.Pages.Campusmap
}
}
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
if (device != null)
{
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
}
}
/// <summary> Methods overrides the OnNavigatedFrom-Method. </summary>
@@ -183,7 +186,10 @@ namespace CampusAppWP8.Pages.Campusmap
/// <seealso cref="M:System.Windows.Controls.Page.OnNavigatedFrom(NavigationEventArgs)"/>
protected override void OnNavigatedFrom(NavigationEventArgs e)
{
this.device.StopSubscribingForMessage(this.ndefId);
if (device != null)
{
this.device.StopSubscribingForMessage(this.ndefId);
}
base.OnNavigatedFrom(e);
}
@@ -489,6 +495,10 @@ namespace CampusAppWP8.Pages.Campusmap
/// <param name="message"> the message of the device. </param>
private void NDEFHandler(ProximityDevice sender, ProximityMessage message)
{
if (device == null)
{
return;
}
// create ndefMessage
this.device.StopSubscribingForMessage(message.SubscriptionId);
var ndefMessage = message.Data;

15
CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
View File

@@ -119,7 +119,10 @@ namespace CampusAppWP8.Pages
protected override void OnNavigatedTo(NavigationEventArgs e)
{
base.OnNavigatedTo(e);
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
if (device != null)
{
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
}
}
/// <summary> Methods overrides the OnNavigatedFrom-Method. </summary>
@@ -127,7 +130,10 @@ namespace CampusAppWP8.Pages
/// <seealso cref="M:System.Windows.Controls.Page.OnNavigatedFrom(NavigationEventArgs)"/>
protected override void OnNavigatedFrom(NavigationEventArgs e)
{
this.device.StopSubscribingForMessage(this.ndefId);
if (device != null)
{
this.device.StopSubscribingForMessage(this.ndefId);
}
base.OnNavigatedFrom(e);
}
@@ -378,6 +384,11 @@ namespace CampusAppWP8.Pages
/// <param name="message"> The message. </param>
private void NDEFHandler(ProximityDevice sender, ProximityMessage message)
{
if (device == null)
{
return;
}
// create ndefMessage
this.device.StopSubscribingForMessage(message.SubscriptionId);
var ndefMessage = message.Data;