Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 18:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove enrollment fraction plumbing from UnlinkDevicesWithIdlePrimaryCommand

Browse Source
This commit is contained in:
Jon Chambers
2025-10-29 10:15:19 -04:00
committed by Jon Chambers
parent 0f950917d8
commit c4d55e099e
2 changed files with 2 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommand.java
View File

@@ -36,9 +36,6 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl
@VisibleForTesting
static final String PRIMARY_IDLE_DAYS_ARGUMENT = "primary-idle-days";
@VisibleForTesting
static final String ENROLLMENT_PERCENTAGE_ARGUMENT = "enrollment-percentage";
@VisibleForTesting
static final int DEFAULT_PRIMARY_IDLE_DAYS = 90;
@@ -75,19 +72,12 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl
.setDefault(DEFAULT_PRIMARY_IDLE_DAYS)
.help("The number of inactivity after which a primary device is considered idle");
subparser.addArgument("--enrollment-percentage")
.type(Integer.class)
.dest(ENROLLMENT_PERCENTAGE_ARGUMENT)
.required(true)
.help("The percentage of eligible accounts from which to unlink devices");
super.configure(subparser);
}
@Override
protected void crawlAccounts(final Flux<Account> accounts) {
final boolean isDryRun = getNamespace().getBoolean(DRY_RUN_ARGUMENT);
final int enrollmentPercentage = getNamespace().getInt(ENROLLMENT_PERCENTAGE_ARGUMENT);
final Duration idleDurationThreshold = Duration.ofDays(getNamespace().getInt(PRIMARY_IDLE_DAYS_ARGUMENT));
final AccountsManager accountsManager = getCommandDependencies().accountsManager();
@@ -98,7 +88,6 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl
final Instant currentTime = clock.instant();
accounts
.filter(account -> isEnrolled(account, enrollmentPercentage))
.filter(account -> isPrimaryDeviceIdle(account, currentTime, idleDurationThreshold))
.flatMap(accountWithIdlePrimaryDevice -> Flux.fromIterable(accountWithIdlePrimaryDevice.getDevices())
.filter(device -> !device.isPrimary())
@@ -128,8 +117,4 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl
return durationSincePrimaryLastSeen.compareTo(idleDurationThreshold) > 0;
}
private static boolean isEnrolled(final Account account, final int enrollmentPercentage) {
return (account.getIdentifier(IdentityType.ACI).hashCode() & Integer.MAX_VALUE) % 100 < enrollmentPercentage;
}
}