Update the matcher output and gradually remove the provider_idx reference

Author: QZHelen

app/src/main/assets/pnv.wasm

@@ -235,8 +235,9 @@ class GetCredentialActivity : FragmentActivity() {
                         return
                     }
                     val selectedEntryId = JSONObject(entryId!!)
-                    val providerIdx = selectedEntryId.getInt("provider_idx")
-                    val selectedId = selectedEntryId.getString("id")
+                    Log.d(TAG, "Selected Entry Info:${entryId}")
+                    val providerIdx = if (selectedEntryId.has("req_idx")) selectedEntryId.getInt("req_idx") else selectedEntryId.getInt("provider_idx")
+                    val selectedId = if (selectedEntryId.has("entry_id")) selectedEntryId.getString("entry_id") else selectedEntryId.getString("id")
                     val dqclCredId = selectedEntryId.getString("dcql_cred_id")
 
                     val pnvResponse = maybeHandlePnv(

app/src/main/java/com/credman/cmwallet/getcred/GetCredentialActivity.kt

@@ -132,9 +132,9 @@ int main() {
                     cJSON* id_obj = cJSON_CreateObject();
                     cJSON* matched_id = cJSON_GetObjectItem(c, "id");
 
-                    cJSON_AddItemReferenceToObject(id_obj, "id", matched_id);
+                    cJSON_AddItemReferenceToObject(id_obj, "entry_id", matched_id);
                     cJSON_AddItemReferenceToObject(id_obj, "dcql_cred_id", doc_id);
-                    cJSON_AddItemReferenceToObject(id_obj, "provider_idx", cJSON_CreateNumber(i));
+                    cJSON_AddItemReferenceToObject(id_obj, "req_idx", cJSON_CreateNumber(i));
                     char* id = cJSON_PrintUnformatted(id_obj);
 
                     if (transaction_credential_ids != NULL) {