Android: Remove intent encryption workaround and use proper permission model for broadcasts (#31)

Author: icedevml

packages/demo-hce-module-app/android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,10 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-permission android:name="android.permission.NFC" />
-    <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
+    <uses-feature android:name="android.hardware.nfc.hce" android:required="false" />
+
+    <permission android:name="com.itsecrnd.rtnhceandroid.HCE_BROADCAST" android:protectionLevel="signature" />
+    <uses-permission android:name="com.itsecrnd.rtnhceandroid.HCE_BROADCAST"/>
 
     <application
       android:name=".MainApplication"
@@ -27,10 +30,10 @@
         </intent-filter>
       </activity>
       <service
-        android:name="com.itsecrnd.rtnhceandroid.HCEService"
+        android:name="com.itsecrnd.rtnhceandroid.service.HCEService"
         android:exported="true"
         android:enabled="true"
-        android:permission="android.permission.BIND_NFC_SERVICE" >
+        android:permission="android.permission.BIND_NFC_SERVICE">
         <intent-filter>
           <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE" />
           <category android:name="android.intent.category.DEFAULT"/>

packages/native-hce-module/README.md

@@ -64,7 +64,9 @@ Afterwards, follow the subsections below for each platform that you need to supp
       ...
 
    +  <uses-permission android:name="android.permission.NFC" />
-   +  <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
+   +  <uses-feature android:name="android.hardware.nfc.hce" android:required="false" />
+   +  <permission android:name="com.itsecrnd.rtnhceandroid.HCE_BROADCAST" android:protectionLevel="signature" />
+   +  <uses-permission android:name="com.itsecrnd.rtnhceandroid.HCE_BROADCAST"/>
 
       ...
 
@@ -75,10 +77,10 @@ Afterwards, follow the subsections below for each platform that you need to supp
         ...
 
    +    <service
-   +      android:name="com.itsecrnd.rtnhceandroid.HCEService"
+   +      android:name="com.itsecrnd.rtnhceandroid.service.HCEService"
    +      android:exported="true"
    +      android:enabled="true"
-   +      android:permission="android.permission.BIND_NFC_SERVICE" >
+   +      android:permission="android.permission.BIND_NFC_SERVICE">
    +      <intent-filter>
    +        <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE" />
    +        <category android:name="android.intent.category.DEFAULT"/>

packages/native-hce-module/android/src/main/java/com/itsecrnd/rtnhceandroid/AESGCMUtil.java

@@ -1,11 +1,11 @@
 package com.itsecrnd.rtnhceandroid;
 
 public class IntentKeys {
+    public static final String PERMISSION_HCE_BROADCAST = "com.itsecrnd.rtnhceandroid.HCE_BROADCAST";
     public static final String ACTION_RECEIVE_C_APDU = "com.itsecrnd.rtnhceandroid.ACTION_RECEIVE_C_APDU";
     public static final String ACTION_SEND_R_APDU = "com.itsecrnd.rtnhceandroid.ACTION_SEND_R_APDU";
     public static final String ACTION_READER_DETECT = "com.itsecrnd.rtnhceandroid.ACTION_READER_DETECT";
     public static final String ACTION_READER_LOST = "com.itsecrnd.rtnhceandroid.ACTION_READER_LOST";
-    public static final String KEY_AUTH = "auth";
     public static final String KEY_CAPDU = "capdu";
     public static final String KEY_RAPDU = "rapdu";
 }