Update wwwverifier to WD6

Modified build scripts to make wwwverifier a subproject of the
Identity Credential project to reduce copy-pasted code. Updated
OriginInfo to match 18013-7 WD6 updates.

Tested appholder changes manually with unattended presentations
via the wwwverifier as well as attended presentations with
appverifier.

.gitignore

@@ -8,4 +8,5 @@
 .idea/
 fastlane/report.xml
 /mdl-ref-server/mdl-server-db.sqlite3
-/version*
+/version*
+wwwverifier/build/*

appholder/src/main/java/com/android/mdl/app/MainActivity.kt

@@ -105,7 +105,7 @@ class MainActivity : AppCompatActivity() {
             // TODO: maybe bail in the future if this isn't set.
         } else {
             logInfo("referrer: $mdocReferrerUri")
-            originInfos.add(OriginInfoWebsite(1, mdocReferrerUri))
+            originInfos.add(OriginInfoWebsite(mdocReferrerUri, OriginInfoWebsite.TYPE_BASE))
         }
 
         viewModel.startPresentationReverseEngagement(mdocUri, originInfos)

appholder/src/main/java/com/android/mdl/app/fragment/ReverseEngagementFragment.kt

@@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.android.identity.mdoc.origininfo.OriginInfo
-import com.android.identity.mdoc.origininfo.OriginInfoQr
 import com.android.mdl.app.databinding.FragmentReverseEngagementBinding
 import com.android.mdl.app.util.log
 import com.android.mdl.app.util.logWarning
@@ -53,9 +52,7 @@ class ReverseEngagementFragment : Fragment() {
                 log("qrText: $qrText")
                 val uri = Uri.parse(qrText)
                 if (uri.scheme.equals("mdoc")) {
-                    val originInfos = ArrayList<OriginInfo>()
-                    originInfos.add(OriginInfoQr(1))
-                    vm.startPresentationReverseEngagement(qrText, originInfos)
+                    vm.startPresentationReverseEngagement(qrText, null)
                     findNavController().navigate(
                         ReverseEngagementFragmentDirections.actionReverseEngagementFragmentToTransferDocumentFragment()
                     )

appholder/src/main/java/com/android/mdl/app/transfer/ReverseQrCommunicationSetup.kt

@@ -46,7 +46,7 @@ class ReverseQrCommunicationSetup(
 
     fun configure(
         reverseEngagementUri: String,
-        origins: List<OriginInfo>
+        origins: List<OriginInfo>?
     ) {
         val uri = Uri.parse(reverseEngagementUri)
         if (!uri.scheme.equals("mdoc")) {

appholder/src/main/java/com/android/mdl/app/transfer/TransferManager.kt

@@ -76,7 +76,7 @@ class TransferManager private constructor(private val context: Context) {
 
     fun startPresentationReverseEngagement(
         reverseEngagementUri: String,
-        origins: List<OriginInfo>
+        origins: List<OriginInfo>?
     ) {
         if (hasStarted) {
             throw IllegalStateException("Transfer has already started.")

appholder/src/main/java/com/android/mdl/app/viewmodel/ShareDocumentViewModel.kt

@@ -20,7 +20,7 @@ class ShareDocumentViewModel(val app: Application) : AndroidViewModel(app) {
 
     fun startPresentationReverseEngagement(
         reverseEngagementUri: String,
-        originInfos: List<OriginInfo>
+        originInfos: List<OriginInfo>?
     ) {
         if (!hasStarted) {
             transferManager.startPresentationReverseEngagement(reverseEngagementUri, originInfos)

identity-android/src/main/java/com/android/identity/android/mdoc/deviceretrieval/DeviceRetrievalHelper.java

@@ -166,7 +166,9 @@ public void onConnected() {
                     EngagementGenerator generator = new EngagementGenerator(
                             mEDeviceKeyPair.getPublic(),
                             EngagementGenerator.ENGAGEMENT_VERSION_1_1);
-                    generator.setOriginInfos(mReverseEngagementOriginInfos);
+                    if (mReverseEngagementOriginInfos != null) {
+                        generator.setOriginInfos(mReverseEngagementOriginInfos);
+                    }
                     mDeviceEngagement = generator.generate();
 
                     // 18013-7 says to use ReaderEngagementBytes for Handover when ReaderEngagement
@@ -713,7 +715,7 @@ public Builder(@NonNull Context context,
          */
         public @NonNull Builder useReverseEngagement(@NonNull DataTransport transport,
                                                      @Nullable byte[] readerEngagement,
-                                                     List<OriginInfo> originInfos) {
+                                                     @Nullable List<OriginInfo> originInfos) {
             mHelper.mTransport = transport;
             mHelper.mReverseEngagementReaderEngagement = readerEngagement;
             mHelper.mReverseEngagementOriginInfos = originInfos;

identity/src/main/java/com/android/identity/mdoc/engagement/EngagementGenerator.java

@@ -41,7 +41,7 @@ public final class EngagementGenerator {
     private static final String TAG = "EngagementGenerator";
     private final String mVersion;
     final private PublicKey mESenderKey;
-    private ArrayBuilder<CborBuilder> mConnectionMethodsArrayBuilder;
+    private ArrayBuilder<CborBuilder> mDeviceRetrievalMethodsArrayBuilder;
     private ArrayBuilder<CborBuilder> mOriginInfoArrayBuilder;
 
     public static final String ENGAGEMENT_VERSION_1_0 = "1.0";
@@ -75,9 +75,9 @@ public EngagementGenerator(@NonNull PublicKey ESenderKey,
      */
     public @NonNull
     EngagementGenerator setConnectionMethods(@NonNull List<ConnectionMethod> connectionMethods) {
-        mConnectionMethodsArrayBuilder = new CborBuilder().addArray();
+        mDeviceRetrievalMethodsArrayBuilder = new CborBuilder().addArray();
         for (ConnectionMethod connectionMethod : connectionMethods) {
-            mConnectionMethodsArrayBuilder.add(Util.cborDecode(connectionMethod.toDeviceEngagement()));
+            mDeviceRetrievalMethodsArrayBuilder.add(Util.cborDecode(connectionMethod.toDeviceEngagement()));
         }
         return this;
     }
@@ -118,8 +118,8 @@ byte[] generate() {
         MapBuilder<CborBuilder> map = builder.addMap();
         map.put(0, mVersion);
         map.put(new UnsignedInteger(1), securityDataItem);
-        if (mConnectionMethodsArrayBuilder != null) {
-            map.put(new UnsignedInteger(2), mConnectionMethodsArrayBuilder.end().build().get(0));
+        if (mDeviceRetrievalMethodsArrayBuilder != null) {
+            map.put(new UnsignedInteger(2), mDeviceRetrievalMethodsArrayBuilder.end().build().get(0));
         }
         if (mOriginInfoArrayBuilder != null) {
             map.put(new UnsignedInteger(5), mOriginInfoArrayBuilder.end().build().get(0));

identity/src/main/java/com/android/identity/mdoc/mso/MobileSecurityObjectParser.java

@@ -24,6 +24,7 @@
 
 import java.security.PublicKey;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -305,7 +306,7 @@ void parse(byte[] encodedMobileSecurityObject) {
             }
 
             mDigestAlgorithm = Util.cborMapExtractString(mso, "digestAlgorithm");
-            final List<String> allowableDigestAlgorithms = List.of("SHA-256", "SHA-384", "SHA-512");
+            final List<String> allowableDigestAlgorithms = Arrays.asList("SHA-256", "SHA-384", "SHA-512");
             if (!allowableDigestAlgorithms.contains(mDigestAlgorithm)) {
                 throw new IllegalArgumentException("Given digest algorithm '" + mDigestAlgorithm +
                         "' one of " + allowableDigestAlgorithms);

identity/src/main/java/com/android/identity/mdoc/mso/StaticAuthDataGenerator.java

@@ -20,8 +20,6 @@
 
 import com.android.identity.internal.Util;
 
-import java.security.cert.X509Certificate;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

identity/src/main/java/com/android/identity/mdoc/origininfo/OriginInfo.java

@@ -30,23 +30,7 @@
 public abstract class OriginInfo {
     private static final String TAG = "OriginInfo";
 
-    /**
-     * The constant used to specify how the current engagement structure is delivered.
-     */
-    public static final long CAT_DELIVERY = 0;
-
-    /**
-     * The constant used to specify how the other party engagement structure has been received.
-     */
-    public static final long CAT_RECEIVE = 1;
-
-    /**
-     * Specifies whether the OriginInfoOptions are about this engagement or the one
-     * received previously
-     *
-     * @return one of {@link #CAT_DELIVERY} or {@link #CAT_RECEIVE}.
-     */
-    public abstract long getCat();
+    public static final long CAT = 1;
 
     public abstract @NonNull DataItem encode();
 
@@ -56,11 +40,8 @@ public abstract class OriginInfo {
         }
         long type = Util.cborMapExtractNumber(oiDataItem, "type");
         switch ((int) type) {
-            case OriginInfoQr.TYPE:
-                return OriginInfoQr.decode(oiDataItem);
-            case OriginInfoNfc.TYPE:
-                return OriginInfoNfc.decode(oiDataItem);
-            case OriginInfoWebsite.TYPE:
+            case OriginInfoWebsite.TYPE_REFERRER:
+            case OriginInfoWebsite.TYPE_BASE:
                 return OriginInfoWebsite.decode(oiDataItem);
         }
         Logger.w(TAG, "Unsupported type " + type);