Improve bulk transceive metadata (#64)

* Improve bulk transceive metadata

* Fix typos

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Adjust

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix

* Adjust

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: skjolber

nfc/core/src/main/java/no/entur/android/nfc/hce/protocol/ResponseAdpuProtocolIsoDep.java

@@ -60,8 +60,8 @@ public <T> T transceive(Parcelable data) throws IOException {
     }
 
     @Override
-    public boolean supportsTransceive(Class c) throws IOException {
-        return false;
+    public <T> T transceiveMetadata(Parcelable c) throws IOException {
+        return null;
     }
 
     @Override

nfc/external-acs/src/main/java/no/entur/android/nfc/external/acs/reader/command/ACRReaderBluetoothTechnology.java

@@ -1,5 +1,6 @@
 package no.entur.android.nfc.external.acs.reader.command;
 
+import android.os.Parcelable;
 import android.os.RemoteException;
 
 import no.entur.android.nfc.external.service.tag.ReaderTechnology;
@@ -53,8 +54,7 @@ public int reconnect(int handle) throws RemoteException {
 	}
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) {
-        return false;
+    public Parcelable transceiveMetadata(Parcelable parcelable) {
+        return null;
     }
-
 }

nfc/external-acs/src/main/java/no/entur/android/nfc/external/acs/reader/command/ACRReaderTechnology.java

@@ -1,5 +1,6 @@
 package no.entur.android.nfc.external.acs.reader.command;
 
+import android.os.Parcelable;
 import android.os.RemoteException;
 
 import com.acs.smartcard.ReaderException;
@@ -73,8 +74,7 @@ public int reconnect(int handle) throws RemoteException {
 	}
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) {
-        return false;
+    public Parcelable transceiveMetadata(Parcelable parcelable) {
+        return null;
     }
-
 }

nfc/external-minova/src/main/java/no/entur/android/nfc/external/minova/reader/MinovaReaderTechnology.java

@@ -1,5 +1,6 @@
 package no.entur.android.nfc.external.minova.reader;
 
+import android.os.Parcelable;
 import android.os.RemoteException;
 
 import no.entur.android.nfc.external.service.tag.ReaderTechnology;
@@ -53,7 +54,7 @@ public int reconnect(int handle) throws RemoteException {
     }
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) {
-        return false;
+    public Parcelable transceiveMetadata(Parcelable parcelable) {
+        return null;
     }
 }

nfc/external/src/main/java/no/entur/android/nfc/external/service/tag/INFcTagBinder.java

@@ -1,6 +1,7 @@
 package no.entur.android.nfc.external.service.tag;
 
 import android.nfc.NdefMessage;
+import android.os.Parcelable;
 import android.os.RemoteException;
 
 import org.slf4j.Logger;
@@ -13,6 +14,8 @@
 import no.entur.android.nfc.wrapper.ErrorCodes;
 import no.entur.android.nfc.wrapper.INfcTag;
 import no.entur.android.nfc.wrapper.ParcelableTransceive;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadata;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadataResult;
 import no.entur.android.nfc.wrapper.ParcelableTransceiveResult;
 import no.entur.android.nfc.wrapper.TagImpl;
 import no.entur.android.nfc.wrapper.TransceiveResult;
@@ -125,11 +128,14 @@ public ParcelableTransceiveResult parcelableTranscieve(int nativeHandle, Parcela
     }
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) throws RemoteException {
+    public ParcelableTransceiveMetadataResult parcelableTransceiveMetadata(ParcelableTransceiveMetadata data) throws RemoteException {
         if (readerTechnology == null) {
             throw new RemoteException(NO_READER_MSG);
         }
-        return readerTechnology.supportsTransceiveParcelable(className);
+
+        Parcelable parcelable = readerTechnology.transceiveMetadata(data.getRequestData());
+
+        return new ParcelableTransceiveMetadataResult(parcelable);
     }
 
     public int getMaxTransceiveLength(int technology) throws RemoteException {

nfc/external/src/main/java/no/entur/android/nfc/external/service/tag/ReaderTechnology.java

@@ -1,5 +1,6 @@
 package no.entur.android.nfc.external.service.tag;
 
+import android.os.Parcelable;
 import android.os.RemoteException;
 
 public interface ReaderTechnology {
@@ -18,5 +19,5 @@ public interface ReaderTechnology {
 
 	int reconnect(int handle) throws RemoteException;
 
-    boolean supportsTransceiveParcelable(String className);
+    Parcelable transceiveMetadata(Parcelable parcelable);
 }

nfc/wrapper-test/src/main/java/no/entur/android/nfc/wrapper/test/binder/DefaultINFcTagBinder.java

@@ -5,6 +5,8 @@
 
 import no.entur.android.nfc.wrapper.INfcTag;
 import no.entur.android.nfc.wrapper.ParcelableTransceive;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadata;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadataResult;
 import no.entur.android.nfc.wrapper.ParcelableTransceiveResult;
 import no.entur.android.nfc.wrapper.TagImpl;
 import no.entur.android.nfc.wrapper.TransceiveResult;
@@ -147,8 +149,8 @@ public ParcelableTransceiveResult parcelableTranscieve(int nativeHandle, Parcela
     }
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) throws RemoteException {
-        return delegate.supportsTransceiveParcelable(className);
+    public ParcelableTransceiveMetadataResult parcelableTransceiveMetadata(ParcelableTransceiveMetadata data) throws RemoteException {
+        return delegate.parcelableTransceiveMetadata(data);
     }
 
     public boolean isLost() {

nfc/wrapper-test/src/main/java/no/entur/android/nfc/wrapper/test/binder/INFcTagBinder.java

@@ -9,6 +9,8 @@
 import java.util.List;
 
 import no.entur.android.nfc.wrapper.ParcelableTransceive;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadata;
+import no.entur.android.nfc.wrapper.ParcelableTransceiveMetadataResult;
 import no.entur.android.nfc.wrapper.ParcelableTransceiveResult;
 import no.entur.android.nfc.wrapper.test.tech.MockBasicTagTechnology;
 import no.entur.android.nfc.wrapper.test.tech.MockIsoDep;
@@ -315,20 +317,15 @@ public ParcelableTransceiveResult parcelableTranscieve(ParcelableTransceive data
         return new ParcelableTransceiveResult(TransceiveResult.RESULT_FAILURE, null);
     }
 
-    public boolean supportsTransceiveParcelable(String className) throws RemoteException {
-        if(connected == -1) {
-            throw new RemoteException("No connected tag technology");
-        }
-
+    public ParcelableTransceiveMetadataResult parcelableTransceiveMetadata(ParcelableTransceiveMetadata data) {
         try {
-            if(connected == TagTechnology.ISO_DEP) {
-                return isoDep.supportsTransceiveParcelable(className);
-            }
+            Parcelable transceive = isoDep.transceiveMetadata(data.getRequestData());
+
+            return new ParcelableTransceiveMetadataResult(transceive);
         } catch (Exception e) {
             Log.d(LOG_TAG, "Transceive problem", e);
         }
-        return false;
-    }
-
 
+        return new ParcelableTransceiveMetadataResult();
+    }
 }

nfc/wrapper-test/src/main/java/no/entur/android/nfc/wrapper/test/tech/MockIsoDep.java

@@ -9,8 +9,6 @@
 
 public class MockIsoDep extends MockBasicTagTechnologyImpl {
 
-    private static final String LOG_TAG = MockIsoDep.class.getName();
-
     private byte[] hiLayerResponse;
     private byte[] historicalBytes;
 
@@ -41,12 +39,11 @@ public void setMockParcelableTransceive(MockParcelableTransceive mockParcelableT
         this.mockParcelableTransceive = mockParcelableTransceive;
     }
 
-
     public <T> T transceive(Parcelable parcelable) throws IOException {
-        return (T)this.mockParcelableTransceive.parcelableTranscieve(parcelable);
+        return (T)this.mockParcelableTransceive.transceive(parcelable);
     }
 
-    public boolean supportsTransceiveParcelable(String cls) throws IOException {
-        return this.mockParcelableTransceive.supportsTransceiveParcelable(cls);
+    public <T> T transceiveMetadata(Parcelable parcelable) throws IOException {
+        return (T)this.mockParcelableTransceive.transceiveMetadata(parcelable);
     }
 }

nfc/wrapper-test/src/main/java/no/entur/android/nfc/wrapper/test/tech/transceive/ListMockParcelableTransceive.java

@@ -51,18 +51,19 @@ public static class Builder {
 
         private byte[] errorResponse;
 
-        private Predicate<String> supportedClass = (c) -> true ;
+        private Parcelable parcelableMetadata = null;
 
         public Builder withErrorResponse(byte[] errorResponse) {
             this.errorResponse = errorResponse;
             return this;
         }
 
-        public Builder withSupportedClass(Predicate<String> supportedClass) {
-            this.supportedClass = supportedClass;
+        public Builder withParcelableMetadata(Parcelable parcelableMetadata) {
+            this.parcelableMetadata = parcelableMetadata;
             return this;
         }
 
+
         public Builder withErrorResponse(String errorResponse) {
             this.errorResponse = MockBasicTagTechnologyImpl.hex(errorResponse);
             return this;
@@ -151,7 +152,7 @@ public ListMockParcelableTransceive build() {
             if(errorResponse == null) {
                 throw new IllegalStateException();
             }
-            return new ListMockParcelableTransceive(transceiveList, errorResponse, supportedClass);
+            return new ListMockParcelableTransceive(transceiveList, errorResponse, parcelableMetadata);
         }
 
     }
@@ -161,12 +162,11 @@ public ListMockParcelableTransceive build() {
     private final List<Transceive> transceiveList;
     private int index = 0;
 
-    private Predicate<String> supportedClass;
-
-    public ListMockParcelableTransceive(List<Transceive> transceiveList, byte[] errorResponse, Predicate<String> supportedClass) {
+    private Parcelable parcelableMetadata;
+    public ListMockParcelableTransceive(List<Transceive> transceiveList, byte[] errorResponse, Parcelable parcelableMetadata) {
         this.transceiveList = transceiveList;
         this.errorResponse = errorResponse;
-        this.supportedClass = supportedClass;
+        this.parcelableMetadata = parcelableMetadata;
     }
 
     public byte[] transceive(byte[] data, boolean raw) throws IOException {
@@ -190,7 +190,7 @@ public byte[] transceive(byte[] data, boolean raw) throws IOException {
     }
 
     @Override
-    public <T> T parcelableTranscieve(Parcelable data) throws IOException {
+    public <T> T transceive(Parcelable data) throws IOException {
         if (index >= transceiveList.size()) {
             index = 0;
             return null;
@@ -211,8 +211,8 @@ public <T> T parcelableTranscieve(Parcelable data) throws IOException {
     }
 
     @Override
-    public boolean supportsTransceiveParcelable(String className) throws IOException {
-        return supportedClass.test(className);
+    public Parcelable transceiveMetadata(Parcelable data) {
+        return parcelableMetadata;
     }
 
 }