zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Merge pull request #586 from mastodon/chore-move-updateActiveUserAccountPublisher 

Move updateActiveUserAccountPublisher to AuthenticationService
This commit is contained in:
Marcus Kida 2022-11-14 14:27:55 +01:00 committed by GitHub
parent 51c7034dc4 548543a8c0
commit 38afbbfbc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/Profile/ProfileViewController.swift
View File

@ -553,7 +553,7 @@ extension ProfileViewController {
} }
// trigger authenticated user account update // trigger authenticated user account update
viewModel.context.instanceService.updateActiveUserAccountPublisher.send() viewModel.context.authenticationService.updateActiveUserAccountPublisher.send()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
sender.endRefreshing() sender.endRefreshing()

2
Mastodon/Scene/Root/MainTab/MainTabBarController.swift
View File

@ -313,7 +313,7 @@ extension MainTabBarController {
let currentUserDisplayName = user.displayNameWithFallback ?? "no user" let currentUserDisplayName = user.displayNameWithFallback ?? "no user"
profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(currentUserDisplayName) profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(currentUserDisplayName)
context.instanceService.updateActiveUserAccountPublisher context.authenticationService.updateActiveUserAccountPublisher
.sink { [weak self] in .sink { [weak self] in
self?.updateUserAccount() self?.updateUserAccount()
} }

2
Mastodon/Supporting Files/SceneDelegate.swift
View File

@ -111,7 +111,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
AppContext.shared.statusFilterService.filterUpdatePublisher.send() AppContext.shared.statusFilterService.filterUpdatePublisher.send()
// trigger authenticated user account update // trigger authenticated user account update
AppContext.shared.instanceService.updateActiveUserAccountPublisher.send() AppContext.shared.authenticationService.updateActiveUserAccountPublisher.send()
if let shortcutItem = savedShortCutItem { if let shortcutItem = savedShortCutItem {
Task { Task {

1
MastodonSDK/Sources/MastodonCore/Service/AuthenticationService.swift
View File

@ -25,6 +25,7 @@ public final class AuthenticationService: NSObject {
// output // output
@Published public var mastodonAuthentications: [ManagedObjectRecord<MastodonAuthentication>] = [] @Published public var mastodonAuthentications: [ManagedObjectRecord<MastodonAuthentication>] = []
@Published public var mastodonAuthenticationBoxes: [MastodonAuthenticationBox] = [] @Published public var mastodonAuthenticationBoxes: [MastodonAuthenticationBox] = []
public let updateActiveUserAccountPublisher = PassthroughSubject<Void, Never>()
init( init(
managedObjectContext: NSManagedObjectContext, managedObjectContext: NSManagedObjectContext,

1
MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift
View File

@ -24,7 +24,6 @@ public final class InstanceService {
weak var authenticationService: AuthenticationService? weak var authenticationService: AuthenticationService?
// output // output
public let updateActiveUserAccountPublisher = PassthroughSubject<Void, Never>()
init( init(
apiService: APIService, apiService: APIService,