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

Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 

# Conflicts:
#	_SharedTestUtilities/MockJobRunner.swift
This commit is contained in:
Morgan Pretty 2023-09-26 11:53:00 +10:00
parent d8b0f76902 e4357f153e
commit 691acf2a42
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Session/Conversations/Settings/ThreadSettingsViewModel.swift
View File

@ -802,12 +802,13 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
)
// Trigger disappear after read
dependencies.jobRunner.upsert(
dependencies[singleton: .jobRunner].upsert(
db,
job: DisappearingMessagesJob.updateNextRunIfNeeded(
db,
interaction: interaction,
startedAtMs: TimeInterval(SnodeAPI.currentOffsetTimestampMs())
startedAtMs: TimeInterval(SnodeAPI.currentOffsetTimestampMs(using: dependencies)),
using: dependencies
),
canStartJob: true,
using: dependencies

1
SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
View File

@ -26,7 +26,6 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
case threadMemberNames
case threadIsNoteToSelf
case contactLastKnownClientVersion
case threadIsMessageRequest
case threadRequiresApproval
case threadShouldBeVisible