Merge pull request #93 from allstarschh/Bug1127735

Bug 1127735 - Update TechDiscoveredNotication. r=dimi
mozilla-b2g · Apr 7, 2015 · eb5edeb · eb5edeb
2 parents 306b329 + 149b554
commit eb5edeb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/src/MessageHandler.cpp b/src/MessageHandler.cpp
@@ -25,7 +25,7 @@
 #include "NfcDebug.h"
 
 #define MAJOR_VERSION (1)
-#define MINOR_VERSION (21)
+#define MINOR_VERSION (22)
 
 using android::Parcel;
 
@@ -81,6 +81,16 @@ void MessageHandler::NotifyTransactionEvent(Parcel& aParcel, void* aData)
   delete event;
 }
 
+void MessageHandler::NotifyNdefReceived(Parcel& aParcel, void* aData)
+{
+  NdefReceivedEvent *event = reinterpret_cast<NdefReceivedEvent*>(aData);
+
+  aParcel.writeInt32(event->sessionId);
+  aParcel.writeInt32(event->ndefMsgCount);
+  SendNdefMsg(aParcel, event->ndefMsg);
+  SendResponse(aParcel);
+}
+
 void MessageHandler::ProcessRequest(const uint8_t* aData, size_t aDataLen)
 {
   Parcel parcel;
@@ -169,6 +179,9 @@ void MessageHandler::ProcessNotification(NfcNotificationType aNotification, void
     case NFC_NOTIFICATION_TRANSACTION_EVENT:
       NotifyTransactionEvent(parcel, aData);
       break;
+    case NFC_NOTIFICATION_NDEF_RECEIVED:
+      NotifyNdefReceived(parcel, aData);
+      break;
     default:
       NFCD_ERROR("Not implement");
       break;

diff --git a/src/MessageHandler.h b/src/MessageHandler.h
@@ -42,6 +42,7 @@ class MessageHandler {
   void NotifyTechDiscovered(android::Parcel& aParcel, void* aData);
   void NotifyTechLost(android::Parcel& aParcel, void* aData);
   void NotifyTransactionEvent(android::Parcel& aParcel, void* aData);
+  void NotifyNdefReceived(android::Parcel& aParcel, void* aData);
 
   bool HandleChangeRFStateRequest(android::Parcel& aParcel);
   bool HandleReadNdefRequest(android::Parcel& aParcel);
@@ -76,4 +77,10 @@ struct TechDiscoveredEvent {
   NdefInfo* ndefInfo;
 };
 
+struct NdefReceivedEvent {
+  int sessionId;
+  uint32_t ndefMsgCount;
+  NdefMessage* ndefMsg;
+};
+
 #endif // mozilla_nfcd_MessageHandler_h
diff --git a/src/NfcGonkMessage.h b/src/NfcGonkMessage.h
@@ -332,6 +332,13 @@ typedef enum {
    * data is [origin type][origin index][aid length][aid][payload length][payload]
    */
   NFC_NOTIFICATION_TRANSACTION_EVENT,
+
+  /**
+   * NFC_NOTIFICATION_NDEF_RECEIVED
+   *
+   * To notify when a NDEF message is received from a P2P connection.
+   */
+  NFC_NOTIFICATION_NDEF_RECEIVED,
 } NfcNotificationType;
 
 /**

diff --git a/src/NfcService.cpp b/src/NfcService.cpp
@@ -453,16 +453,11 @@ void NfcService::HandleReceiveNdefEvent(NfcEvent* aEvent)
 {
   NdefMessage* ndef = reinterpret_cast<NdefMessage*>(aEvent->obj);
 
-  TechDiscoveredEvent* data = new TechDiscoveredEvent();
+  NdefReceivedEvent* data = new NdefReceivedEvent();
   data->sessionId = SessionId::GetCurrentId();
-  data->isP2P = true;
-  data->techCount = 0;
-  data->techList = NULL;
-  data->tagIdCount = 0;
-  data->tagId = NULL;
   data->ndefMsgCount = ndef ? 1 : 0;
   data->ndefMsg = ndef;
-  mMsgHandler->ProcessNotification(NFC_NOTIFICATION_TECH_DISCOVERED, data);
+  mMsgHandler->ProcessNotification(NFC_NOTIFICATION_NDEF_RECEIVED, data);
 
   delete data;
   delete ndef;