From b996707f0b6366cdecd06114362c028926ca856c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 8 Jul 2020 16:36:54 -0300 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Util/RemoteConfigManager.swift | 6 +++++- SignalServiceKit/src/groups/GroupManager.swift | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Util/RemoteConfigManager.swift b/SignalServiceKit/src/Util/RemoteConfigManager.swift index 4ca00ed6b4..90676d633b 100644 --- a/SignalServiceKit/src/Util/RemoteConfigManager.swift +++ b/SignalServiceKit/src/Util/RemoteConfigManager.swift @@ -70,7 +70,11 @@ public class RemoteConfig: BaseFlags { } @objc - public static func groupsV2maxMemberCount(defaultValue: UInt) -> UInt { + public static let groupsV2maxMemberCountDefault: UInt = 100 + + @objc + public static var groupsV2maxMemberCount: UInt { + let defaultValue = groupsV2maxMemberCountDefault guard let rawValue: AnyObject = value(.groupsV2memberCountMax) else { owsFailDebug("Missing value.") return defaultValue diff --git a/SignalServiceKit/src/groups/GroupManager.swift b/SignalServiceKit/src/groups/GroupManager.swift index 86c1f8cd8d..76bd18ff87 100644 --- a/SignalServiceKit/src/groups/GroupManager.swift +++ b/SignalServiceKit/src/groups/GroupManager.swift @@ -96,12 +96,11 @@ public class GroupManager: NSObject { public static let groupUpdateTimeoutDuration: TimeInterval = 30 public static var maxGroupMemberCount: UInt { - let defaultValue: UInt = 100 guard AppReadiness.isAppReady else { owsFailDebug("Storage is not yet ready.") - return defaultValue + return RemoteConfig.groupsV2maxMemberCountDefault } - return RemoteConfig.groupsV2maxMemberCount(defaultValue: defaultValue) + return RemoteConfig.groupsV2maxMemberCount } public static let maxGroupNameLength: Int = 32