Merge pull request #597 from open-eid/MOPPAND-1556

Set NFC true in User-Agent for NFC signing.

Author: Counter178

app/src/main/java/ee/ria/DigiDoc/android/model/idcard/IdCardService.java

@@ -77,7 +77,7 @@ public Single<SignedContainer> sign(Context context, Token token, SignedContaine
                     return container.sign(context, data.signCertificate().data(),
                             signData -> ByteString.of(token.calculateSignature(pin2,
                                     signData.toByteArray(),
-                                    data.signCertificate().ellipticCurve())), roleData, true);
+                                    data.signCertificate().ellipticCurve())), roleData, true, false);
                 })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());

app/src/main/java/ee/ria/DigiDoc/android/signature/update/SignatureAddSource.java

@@ -214,7 +214,7 @@ public Single<SignedContainer> sign(Context context, String signatureValue, byte
                                         @Nullable RoleData roleData) {
         return Single
                 .fromCallable(() -> container.sign(context, ByteString.of(dataToSign),
-                        signData -> ByteString.encodeUtf8(signatureValue), roleData, false))
+                        signData -> ByteString.encodeUtf8(signatureValue), roleData, false, false))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }

app/src/main/java/ee/ria/DigiDoc/android/signature/update/nfc/NFCOnSubscribe.java

@@ -136,7 +136,7 @@ private NFCResponse onTagDiscovered(NfcAdapter adapter, Tag tag) {
             Timber.log(Log.DEBUG, "Set ENV: %x %s", r.code, Hex.toHexString(r.data));
 
             container.sign(navigator.activity(), cert.data(),
-                    signData -> ByteString.of(nfc.calculateSignature(signData.toByteArray())), role, false);
+                    signData -> ByteString.of(nfc.calculateSignature(signData.toByteArray())), role, false, true);
         } catch (TagLostException exc) {
             Timber.log(Log.ERROR, exc.getMessage());
             result = NFCResponse.createWithStatus(SessionStatusResponse.ProcessStatus.GENERAL_ERROR, navigator.activity().getString(R.string.signature_update_nfc_tag_lost));

common-lib/src/main/java/ee/ria/DigiDoc/common/UserAgentUtil.java

@@ -27,6 +27,11 @@ public final class UserAgentUtil {
     private UserAgentUtil() {}
 
     public static String getUserAgent(Context context, boolean shouldIncludeDevices) {
+        return getUserAgent(context, shouldIncludeDevices, false);
+    }
+
+    public static String getUserAgent(Context context, boolean shouldIncludeDevices,
+                                      boolean isNFCSignature) {
         ArrayList<String> deviceProductNames = new ArrayList<>();
         StringBuilder initializingMessage = new StringBuilder();
 
@@ -41,6 +46,9 @@ public static String getUserAgent(Context context, boolean shouldIncludeDevices)
             if (shouldIncludeDevices && !deviceProductNames.isEmpty()) {
                 initializingMessage.append(" Devices: ").append(TextUtils.join(", ", deviceProductNames));
             }
+            if (isNFCSignature) {
+                initializingMessage.append(" NFC: true");
+            }
         }
 
         return initializingMessage.toString();

sign-lib/src/main/java/ee/ria/DigiDoc/sign/SignedContainer.java

@@ -210,15 +210,16 @@ public final SignedContainer addAdEsSignature(byte[] adEsSignature) throws Excep
 
     public final SignedContainer sign(Context context, ByteString certificate,
                                       Function<ByteString, ByteString> signFunction,
-                                      @Nullable RoleData roleData, boolean userAgentDevices) throws Exception {
+                                      @Nullable RoleData roleData, boolean userAgentDevices,
+                                      boolean isNFCSignature) throws Exception {
         ee.ria.libdigidocpp.Signature signature = null;
 
         try {
             Container container = container(file(), false);
 
             ExternalSigner signer = new ExternalSigner(certificate.toByteArray());
             signer.setProfile(signatureProfile());
-            signer.setUserAgent(UserAgentUtil.getUserAgent(context, userAgentDevices));
+            signer.setUserAgent(UserAgentUtil.getUserAgent(context, userAgentDevices, isNFCSignature));
 
             if (roleData != null) {
                 signer.setSignerRoles(new StringVector(TextUtil.removeEmptyStrings(roleData.getRoles())));