From 1ce1ae91be709eba4ce01142596336bf98c13bb4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 29 May 2021 10:08:16 +0200
Subject: [PATCH] Use System.currentTimeMillis

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java   | 8 ++++----
 .../signal/manager/storage/messageCache/MessageCache.java | 3 +--
 .../java/org/asamk/signal/manager/util/ProfileUtils.java  | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 87b0f30a..0f75f909 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -333,7 +333,7 @@ public class Manager implements Closeable {
         if (account.getLastReceiveTimestamp() == 0) {
             logger.warn("The Signal protocol expects that incoming messages are regularly received.");
         } else {
-            var diffInMilliseconds = new Date().getTime() - account.getLastReceiveTimestamp();
+            var diffInMilliseconds = System.currentTimeMillis() - account.getLastReceiveTimestamp();
             long days = TimeUnit.DAYS.convert(diffInMilliseconds, TimeUnit.MILLISECONDS);
             if (days > 7) {
                 logger.warn(
@@ -585,7 +585,7 @@ public class Manager implements Closeable {
     ) {
         var profile = account.getProfileStore().getProfile(recipientId);
 
-        var now = new Date().getTime();
+        var now = System.currentTimeMillis();
         // Profiles are cached for 24h before retrieving them again, unless forced
         if (!force && profile != null && now - profile.getLastUpdateTimestamp() < 24 * 60 * 60 * 1000) {
             return profile;
@@ -611,7 +611,7 @@ public class Manager implements Closeable {
 
         var profileKey = account.getProfileStore().getProfileKey(recipientId);
         if (profileKey == null) {
-            profile = new Profile(new Date().getTime(),
+            profile = new Profile(System.currentTimeMillis(),
                     null,
                     null,
                     null,
@@ -1993,7 +1993,7 @@ public class Manager implements Closeable {
             SignalServiceContent content = null;
             Exception exception = null;
             final CachedMessage[] cachedMessage = {null};
-            account.setLastReceiveTimestamp(new Date().getTime());
+            account.setLastReceiveTimestamp(System.currentTimeMillis());
             try {
                 var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
                     final var recipientId = envelope1.hasSource()
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 76e402ad..fc517278 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -51,7 +50,7 @@ public class MessageCache {
     }
 
     public CachedMessage cacheMessage(SignalServiceEnvelope envelope, RecipientId recipientId) {
-        final var now = new Date().getTime();
+        final var now = System.currentTimeMillis();
 
         try {
             var cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index c2ab7a5e..814bd7fa 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -8,7 +8,6 @@ import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 
 import java.util.Base64;
-import java.util.Date;
 import java.util.HashSet;
 
 public class ProfileUtils {
@@ -23,7 +22,7 @@ public class ProfileUtils {
             var aboutEmoji = decrypt(encryptedProfile.getAboutEmoji(), profileCipher);
 
             final var nameParts = splitName(name);
-            return new Profile(new Date().getTime(),
+            return new Profile(System.currentTimeMillis(),
                     nameParts.first(),
                     nameParts.second(),
                     about,
-- 
2.50.1