From 2b5a49641a6253a1841a53ee0b6ee28ed0c26ab8 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 29 Jan 2024 21:21:20 +0100
Subject: [PATCH] [Huawei] Fix clientNonce for HiChainLite

---
 .../devices/huawei/requests/GetAuthRequest.java        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 091e2ee72..8d1a4a274 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -67,16 +67,14 @@ public class GetAuthRequest extends Request {
 
         try {
             if (isHiChainLite) {
-                nonce = clientNonce;
                 key = paramsProvider.getPinCode();
                 if (authVersion == 0x02)
                     key = paramsProvider.getSecretKey();
-            } else { // normal mode
-                nonce = ByteBuffer.allocate(18)
-                        .putShort(authVersion)
-                        .put(clientNonce)
-                        .array();
             }
+            nonce = ByteBuffer.allocate(18)
+                    .putShort(authVersion)
+                    .put(clientNonce)
+                    .array();
             byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
             if (challenge == null)
                 throw new RequestCreationException("Challenge null");