From a5f853c67a122891f8b4be16418edb43b8ef0768 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Thu, 25 May 2023 16:16:35 -0400 Subject: [PATCH] Change inactive account age threshold from 365 to 180 days --- .../whispersystems/textsecuregcm/storage/AccountCleaner.java | 2 +- .../textsecuregcm/storage/AccountCleanerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java index 7f7d91acb..99268c396 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java @@ -68,7 +68,7 @@ public class AccountCleaner extends AccountDatabaseCrawlerListener { } private static boolean isExpired(Account account) { - return account.getLastSeen() + TimeUnit.DAYS.toMillis(365) < System.currentTimeMillis(); + return account.getLastSeen() + TimeUnit.DAYS.toMillis(180) < System.currentTimeMillis(); } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java index 7f3e6e822..e4b06c71e 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java @@ -54,7 +54,7 @@ class AccountCleanerTest { when(undeletedDisabledDevice.isEnabled()).thenReturn(false); when(undeletedDisabledDevice.getGcmId()).thenReturn("foo"); when(undeletedDisabledAccount.isEnabled()).thenReturn(false); - when(undeletedDisabledAccount.getLastSeen()).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(366)); + when(undeletedDisabledAccount.getLastSeen()).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(181)); when(undeletedDisabledAccount.getMasterDevice()).thenReturn(Optional.of(undeletedDisabledDevice)); when(undeletedDisabledAccount.getNumber()).thenReturn("+14152222222"); when(undeletedDisabledAccount.getUuid()).thenReturn(UUID.randomUUID()); @@ -64,7 +64,7 @@ class AccountCleanerTest { when(undeletedEnabledAccount.isEnabled()).thenReturn(true); when(undeletedEnabledAccount.getMasterDevice()).thenReturn(Optional.of(undeletedEnabledDevice)); when(undeletedEnabledAccount.getNumber()).thenReturn("+14153333333"); - when(undeletedEnabledAccount.getLastSeen()).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(364)); + when(undeletedEnabledAccount.getLastSeen()).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(179)); when(undeletedEnabledAccount.getUuid()).thenReturn(UUID.randomUUID()); deletionExecutor = Executors.newFixedThreadPool(2);