Fixed #25

poz1 · Apr 10, 2018 · 7ede53a · 7ede53a
1 parent 7db90e5
commit 7ede53a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/Example/NFCFormsSample/NFCFormsSample/NFCPage.cs b/Example/NFCFormsSample/NFCFormsSample/NFCPage.cs
@@ -144,8 +144,13 @@ void HandleClicked(object sender, EventArgs e)
 
         private ObservableCollection<string> readNDEFMEssage(NdefMessage message)
         {
-
             ObservableCollection<string> collection = new ObservableCollection<string>();
+
+            if (message == null)
+            {
+                return collection;
+            }
+
             foreach (NdefRecord record in message)
             {
                 // Go through each record, check if it's a Smart Poster

diff --git a/Source/Poz1.NFCForms.Droid/NfcForms.cs b/Source/Poz1.NFCForms.Droid/NfcForms.cs
@@ -69,17 +69,17 @@ private Ndef GetNdef(Tag tag)
 				return ndef;
 		}
 
-		private NdefLibrary.Ndef.NdefMessage ReadNdef(Ndef ndef)
-		{	
-			try
-			{
-				return NdefLibrary.Ndef.NdefMessage.FromByteArray(ndef.CachedNdefMessage.ToByteArray());
-			}
+        private NdefLibrary.Ndef.NdefMessage ReadNdef(Ndef ndef)
+		{
+            if (ndef == null || ndef.CachedNdefMessage == null)
+            {
+                return null;
+            }
 
-			catch
-			{
-				throw new Exception("Tag Error: No NDEF message found o NDEF not supported");
-			}
+            var bytes = ndef.CachedNdefMessage.ToByteArray();
+            var message = NdefLibrary.Ndef.NdefMessage.FromByteArray(bytes);
+
+            return message;
 		}
 
 		#endregion