fix(Android): Executing transaction fails at runtime (#2100)

Signed-off-by: Ivan Ivanov <[email protected]>
hashgraph · Nov 28, 2024 · d88f7b4 · d88f7b4
1 parent dff3bef
commit d88f7b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/BaseNode.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/BaseNode.java
@@ -363,18 +363,8 @@ synchronized void close(Duration timeout) throws InterruptedException {
      * @return                          the user agent string
      */
     private String getUserAgent() {
-        var theModule = getClass().getModule();
         var thePackage = getClass().getPackage();
-        String implementationVersion;
-        if (theModule.getName() == null) {
-            // running on classpath
-            implementationVersion =
-                thePackage != null ? thePackage.getImplementationVersion() : null;
-        } else {
-            // running on module path
-            implementationVersion =
-                theModule.getDescriptor().version().map(ModuleDescriptor.Version::toString).orElse(null);
-        }
+        var implementationVersion = thePackage != null ? thePackage.getImplementationVersion() : null;
         return "hedera-sdk-java/" + ((implementationVersion != null) ? ("v" + implementationVersion) : "DEV");
     }
 }
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/TransactionId.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/TransactionId.java
@@ -29,6 +29,7 @@
 import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
@@ -69,7 +70,6 @@ public final class TransactionId implements Comparable<TransactionId> {
 
     private static final long NANOSECONDS_TO_REMOVE = 10000000000L;
 
-    private static final Random randomNanosecs = new Random();
     private static final AtomicLong monotonicTime = new AtomicLong();
 
 
@@ -128,7 +128,8 @@ public static TransactionId generate(AccountId accountId) {
             }
         } while (!monotonicTime.compareAndSet(lastTime, currentTime));
 
-        return new TransactionId(accountId, Instant.ofEpochSecond(0, currentTime + randomNanosecs.nextLong(1_000)));
+        // NOTE: using ThreadLocalRandom because it's compatible with Android SDK version 26
+        return new TransactionId(accountId, Instant.ofEpochSecond(0, currentTime + ThreadLocalRandom.current().nextLong(1_000)));
     }
 
     /**