keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated dev settings to only reset settings which have been set

Browse Source
pull/1061/head
Morgan Pretty 2 weeks ago
parent a63e58b96b
commit 49b874f4d8
3 changed files with 99 additions and 48 deletions
Show Stats Download Patch File Download Diff File

125
Session/Settings/DeveloperSettingsViewModel.swift
Unescape Escape View File

@ -75,7 +75,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
case resetSnodeCache
case pushNotificationService
case updatedDisappearingMessages
case debugDisappearingMessageDurations
case updatedGroups
@ -113,7 +112,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
case .resetSnodeCache: return "resetSnodeCache"
case .pushNotificationService: return "pushNotificationService"
case .updatedDisappearingMessages: return "updatedDisappearingMessages"
case .debugDisappearingMessageDurations: return "debugDisappearingMessageDurations"
case .updatedGroups: return "updatedGroups"
@ -154,7 +152,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
case .resetSnodeCache: result.append(.resetSnodeCache); fallthrough
case .pushNotificationService: result.append(.pushNotificationService); fallthrough
case .updatedDisappearingMessages: result.append(.updatedDisappearingMessages); fallthrough
case .debugDisappearingMessageDurations: result.append(.debugDisappearingMessageDurations); fallthrough
case .updatedGroups: result.append(.updatedGroups); fallthrough
@ -196,7 +193,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
let pushNotificationService: PushNotificationAPI.Service
let debugDisappearingMessageDurations: Bool
let updatedDisappearingMessages: Bool
let updatedGroups: Bool
let legacyGroupsDeprecated: Bool
@ -231,7 +227,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
pushNotificationService: dependencies[feature: .pushNotificationService],
debugDisappearingMessageDurations: dependencies[feature: .debugDisappearingMessageDurations],
updatedDisappearingMessages: dependencies[feature: .updatedDisappearingMessages],
updatedGroups: dependencies[feature: .updatedGroups],
legacyGroupsDeprecated: dependencies[feature: .legacyGroupsDeprecated],
@ -491,23 +486,6 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
to: !current.debugDisappearingMessageDurations
)
}
),
SessionCell.Info(
id: .updatedDisappearingMessages,
title: "Use Updated Disappearing Messages",
subtitle: """
Controls whether legacy or updated disappearing messages should be used.
""",
trailingAccessory: .toggle(
current.updatedDisappearingMessages,
oldValue: previous?.updatedDisappearingMessages
),
onTap: { [weak self] in
self?.updateFlag(
for: .updatedDisappearingMessages,
to: !current.updatedDisappearingMessages
)
}
)
]
)
@ -790,40 +768,107 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
TableItem.allCases.forEach { item in
switch item {
case .developerMode: break // Not a feature
case .animationsEnabled: updateFlag(for: .animationsEnabled, to: nil)
case .showStringKeys: updateFlag(for: .showStringKeys, to: nil)
case .animationsEnabled:
guard dependencies.hasSet(feature: .animationsEnabled) else { return }
updateFlag(for: .animationsEnabled, to: nil)
case .showStringKeys:
guard dependencies.hasSet(feature: .showStringKeys) else { return }
updateFlag(for: .showStringKeys, to: nil)
case .resetSnodeCache: break // Not a feature
case .exportDatabase: break // Not a feature
case .importDatabase: break // Not a feature
case .advancedLogging: break // Not a feature
case .defaultLogLevel: updateDefaulLogLevel(to: nil)
case .loggingCategory: resetLoggingCategories()
case .defaultLogLevel: updateDefaulLogLevel(to: nil) // Always reset
case .loggingCategory: resetLoggingCategories() // Always reset
case .serviceNetwork: updateServiceNetwork(to: nil)
case .forceOffline: updateFlag(for: .forceOffline, to: nil)
case .pushNotificationService: updatePushNotificationService(to: nil)
case .serviceNetwork:
guard dependencies.hasSet(feature: .serviceNetwork) else { return }
updateServiceNetwork(to: nil)
case .forceOffline:
guard dependencies.hasSet(feature: .forceOffline) else { return }
updateFlag(for: .forceOffline, to: nil)
case .pushNotificationService:
guard dependencies.hasSet(feature: .pushNotificationService) else { return }
updatePushNotificationService(to: nil)
case .debugDisappearingMessageDurations:
guard dependencies.hasSet(feature: .debugDisappearingMessageDurations) else { return }
updateFlag(for: .debugDisappearingMessageDurations, to: nil)
case .updatedDisappearingMessages: updateFlag(for: .updatedDisappearingMessages, to: nil)
case .updatedGroups:
guard dependencies.hasSet(feature: .updatedGroups) else { return }
updateFlag(for: .updatedGroups, to: nil)
case .legacyGroupsDeprecated:
guard dependencies.hasSet(feature: .legacyGroupsDeprecated) else { return }
case .updatedGroups: updateFlag(for: .updatedGroups, to: nil)
case .legacyGroupsDeprecated: updateLegacyGroupsDeprecated(to: nil)
case .updatedGroupsDisableAutoApprove: updateFlag(for: .updatedGroupsDisableAutoApprove, to: nil)
case .updatedGroupsRemoveMessagesOnKick: updateFlag(for: .updatedGroupsRemoveMessagesOnKick, to: nil)
updateLegacyGroupsDeprecated(to: nil)
case .updatedGroupsDisableAutoApprove:
guard dependencies.hasSet(feature: .updatedGroupsDisableAutoApprove) else { return }
updateFlag(for: .updatedGroupsDisableAutoApprove, to: nil)
case .updatedGroupsRemoveMessagesOnKick:
guard dependencies.hasSet(feature: .updatedGroupsRemoveMessagesOnKick) else { return }
updateFlag(for: .updatedGroupsRemoveMessagesOnKick, to: nil)
case .updatedGroupsAllowHistoricAccessOnInvite:
guard dependencies.hasSet(feature: .updatedGroupsAllowHistoricAccessOnInvite) else {
return
}
updateFlag(for: .updatedGroupsAllowHistoricAccessOnInvite, to: nil)
case .updatedGroupsAllowDisplayPicture: updateFlag(for: .updatedGroupsAllowDisplayPicture, to: nil)
case .updatedGroupsAllowDisplayPicture:
guard dependencies.hasSet(feature: .updatedGroupsAllowDisplayPicture) else { return }
updateFlag(for: .updatedGroupsAllowDisplayPicture, to: nil)
case .updatedGroupsAllowDescriptionEditing:
guard dependencies.hasSet(feature: .updatedGroupsAllowDescriptionEditing) else { return }
updateFlag(for: .updatedGroupsAllowDescriptionEditing, to: nil)
case .updatedGroupsAllowPromotions: updateFlag(for: .updatedGroupsAllowPromotions, to: nil)
case .updatedGroupsAllowInviteById: updateFlag(for: .updatedGroupsAllowInviteById, to: nil)
case .updatedGroupsDeleteBeforeNow: updateFlag(for: .updatedGroupsDeleteBeforeNow, to: nil)
case .updatedGroupsDeleteAttachmentsBeforeNow: updateFlag(for: .updatedGroupsDeleteAttachmentsBeforeNow, to: nil)
case .forceSlowDatabaseQueries: updateFlag(for: .forceSlowDatabaseQueries, to: nil)
case .updatedGroupsAllowPromotions:
guard dependencies.hasSet(feature: .updatedGroupsAllowPromotions) else { return }
updateFlag(for: .updatedGroupsAllowPromotions, to: nil)
case .updatedGroupsAllowInviteById:
guard dependencies.hasSet(feature: .updatedGroupsAllowInviteById) else { return }
updateFlag(for: .updatedGroupsAllowInviteById, to: nil)
case .updatedGroupsDeleteBeforeNow:
guard dependencies.hasSet(feature: .updatedGroupsDeleteBeforeNow) else { return }
updateFlag(for: .updatedGroupsDeleteBeforeNow, to: nil)
case .updatedGroupsDeleteAttachmentsBeforeNow:
guard dependencies.hasSet(feature: .updatedGroupsDeleteAttachmentsBeforeNow) else {
return
}
updateFlag(for: .updatedGroupsDeleteAttachmentsBeforeNow, to: nil)
case .forceSlowDatabaseQueries:
guard dependencies.hasSet(feature: .forceSlowDatabaseQueries) else { return }
updateFlag(for: .forceSlowDatabaseQueries, to: nil)
}
}

10
SessionUtilitiesKit/Dependency Injection/Dependencies.swift
Unescape Escape View File

@ -178,6 +178,16 @@ public extension Dependencies {
.eraseToAnyPublisher()
}
func hasSet<T: FeatureOption>(feature: FeatureConfig<T>) -> Bool {
return threadSafeChange(for: feature.identifier, of: .feature) {
guard let instance: Feature<T> = getValue(feature.identifier, of: .feature) else {
return false
}
return instance.hasStoredValue(using: self)
}
}
func set<T: FeatureOption>(feature: FeatureConfig<T>, to updatedFeature: T?) {
threadSafeChange(for: feature.identifier, of: .feature) {
/// Update the cached & in-memory values

12
SessionUtilitiesKit/General/Feature.swift
Unescape Escape View File

@ -28,14 +28,6 @@ public extension FeatureStorage {
identifier: "debugDisappearingMessageDurations"
)
static let updatedDisappearingMessages: FeatureConfig<Bool> = Dependencies.create(
identifier: "updatedDisappearingMessages",
automaticChangeBehaviour: Feature<Bool>.ChangeBehaviour(
value: true,
condition: .after(timestamp: 1710284400)
)
)
static let forceSlowDatabaseQueries: FeatureConfig<Bool> = Dependencies.create(
identifier: "forceSlowDatabaseQueries"
)
@ -155,6 +147,10 @@ public struct Feature<T: FeatureOption>: FeatureType {
// MARK: - Functions
internal func hasStoredValue(using dependencies: Dependencies) -> Bool {
return (dependencies[defaults: .appGroup].object(forKey: identifier) != nil)
}
internal func currentValue(using dependencies: Dependencies) -> T {
let maybeSelectedOption: T? = {
// `Int` defaults to `0` and `Bool` defaults to `false` so rather than those (in case we want

Write Preview
Loading…
Cancel
Save