2FAS/2fas-ios
1
0
Fork 0
mirror of https://github.com/twofas/2fas-ios.git synced 2024-11-22 02:10:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

TF-1311 Fixes, logs

Browse Source
This commit is contained in:
Zbigniew Cisiński 2024-03-15 01:14:45 +01:00
parent e92d4eb31f
commit f83e728a32
13 changed files with 88 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TwoFAS/Data/Interactors/LocalNotificationFetchInteractor.swift
View File

@ -18,6 +18,7 @@
//
import Foundation
import Common
public struct LocalNotification: Hashable {
public enum NotificationKind: String, Decodable, Hashable {
@ -66,16 +67,20 @@ final class LocalNotificationFetchInteractor {
extension LocalNotificationFetchInteractor: LocalNotificationFetchInteracting {
func getNotification(completion: @escaping (LocalNotification?) -> Void) {
Log("Local Notification Fetch - fetching", module: .interactor)
if mainRepository.localNotificationsHandled {
Log("Local Notification Fetch - handled, ready", module: .interactor)
fetched = true
completion(currentNotification())
} else {
Log("Local Notification Fetch - awaiting", module: .interactor)
notificationCallback = completion
}
}
func markNotificationAsRead() {
setWasRead(true)
Log("Local Notification Fetch - mark as read", module: .interactor)
setWasRead(true)
}
}
@ -84,6 +89,7 @@ private extension LocalNotificationFetchInteractor {
private func notificationsHandled() {
guard !fetched else { return }
fetched = true
Log("Local Notification Fetch - handled after awaiting", module: .interactor)
notificationCallback?(currentNotification())
}
@ -104,10 +110,16 @@ private extension LocalNotificationFetchInteractor {
}
func currentNotification() -> LocalNotification? {
guard let publishedID, let notificationPublishedDate else { return nil }
guard let publishedID, let notificationPublishedDate else {
Log("Local Notification Fetch - no notification", module: .interactor)
return nil
}
let kind = LocalNotification.NotificationKind.kindFromCycle(cycle)
Log("Local Notification Fetch - we have notification of kind: \(kind)", module: .interactor)
return LocalNotification(
id: publishedID,
kind: .kindFromCycle(cycle),
kind: kind,
publishedAt: notificationPublishedDate,
wasRead: wasRead
)

19
TwoFAS/Data/Interactors/LocalNotificationStateInteractor.swift
View File

@ -59,6 +59,7 @@ final class LocalNotificationStateInteractor {
self?.awaitsBackupStateChange?()
self?.awaitsBackupStateChange = nil
}
cloudBackup.startMonitoring()
}
}
@ -71,6 +72,7 @@ extension LocalNotificationStateInteractor: LocalNotificationStateInteracting {
if runCount >= 2 && cycle == -2 {
startNotification(-1)
return
}
guard isTimeForNext else {
@ -82,6 +84,8 @@ extension LocalNotificationStateInteractor: LocalNotificationStateInteracting {
let next = nextCycle()
Log("Local Notification State - next cycle: \(next)", module: .interactor)
switch next {
case 0: canDisplayBackup { [weak self] value in
if value {
@ -89,33 +93,35 @@ extension LocalNotificationStateInteractor: LocalNotificationStateInteracting {
} else {
self?.setInactiveNotification(next)
}
self?.markLocalNotificationsAsHandled()
}
case 1: if canDisplayBrowserExtension() {
startNotification(next)
} else {
setInactiveNotification(next)
}
markLocalNotificationsAsHandled()
case 2: if canDisplayDonation() {
startNotification(3)
} else {
setInactiveNotification(next)
}
markLocalNotificationsAsHandled()
default: break
}
markLocalNotificationsAsHandled()
}
}
private extension LocalNotificationStateInteractor {
func markLocalNotificationsAsHandled() {
Log("Local Notification State - notification handled", module: .interactor)
mainRepository.markLocalNotificationsAsHandled()
notificationCenter.post(name: .localNotificationsHandled, object: nil)
}
var isTimeForNext: Bool {
guard let publicationDate = mainRepository.localNotificationPublicationDate else {
return false
return true
}
let days = publicationDate.days(from: .now)
return days >= cycleDays
@ -130,10 +136,12 @@ private extension LocalNotificationStateInteractor {
}
func saveCycle(_ cycle: Int) {
Log("Local Notification State - setting cycle: \(cycle)", module: .interactor)
mainRepository.saveLocalNotificationCycle(cycle)
}
func increaseRunCount() {
Log("Local Notification State - increaseRunCount", module: .interactor)
mainRepository.saveRunCount(runCount + 1)
}
@ -146,12 +154,14 @@ private extension LocalNotificationStateInteractor {
}
func startNotification(_ cycle: Int) {
Log("Local Notification State - start notification for cycle: \(cycle)", module: .interactor)
saveNotificationPublicationDate()
saveCycle(cycle)
setIsPublished(true)
}
func setInactiveNotification(_ cycle: Int) {
Log("Local Notification State - set inactive notification for cycle: \(cycle)", module: .interactor)
saveNotificationPublicationDate()
saveCycle(cycle)
setIsPublished(false)
@ -162,6 +172,7 @@ private extension LocalNotificationStateInteractor {
}
func clearNotification() {
Log("Local Notification State - clear notifications", module: .interactor)
setIsPublished(false)
clearNotificationPublicationDate()
setWasRead(false)
@ -210,7 +221,7 @@ private extension LocalNotificationStateInteractor {
}
func isBackupPossible() -> Bool {
!cloudBackup.isBackupEnabled && cloudBackup.isBackupAvailable && hasServices && !mdmInteractor.isBackupBlocked
!cloudBackup.isBackupEnabled && hasServices && !mdmInteractor.isBackupBlocked
}
func canDisplayBrowserExtension() -> Bool {

6
TwoFAS/TwoFAS/Interactors/ModuleInteractorFactory.swift
View File

@ -32,7 +32,8 @@ final class ModuleInteractorFactory {
registerDeviceInteractor: InteractorFactory.shared.registerDeviceInteractor(),
appStateInteractor: InteractorFactory.shared.appStateInteractor(),
notificationInteractor: InteractorFactory.shared.notificationInteractor(),
widgetsInteractor: InteractorFactory.shared.widgetsInteractor()
widgetsInteractor: InteractorFactory.shared.widgetsInteractor(),
localNotificationStateInteractor: InteractorFactory.shared.localNotificationStateInteractor()
)
}
@ -343,8 +344,7 @@ final class ModuleInteractorFactory {
appInfoInteractor: InteractorFactory.shared.appInfoInteractor(),
rootInteractor: InteractorFactory.shared.rootInteractor(),
mdmInteractor: InteractorFactory.shared.mdmInteractor(),
protectionInteractor: InteractorFactory.shared.protectionInteractor(),
localNotificationStateInteractor: InteractorFactory.shared.localNotificationStateInteractor()
protectionInteractor: InteractorFactory.shared.protectionInteractor()
)
}

10
TwoFAS/TwoFAS/Root/Interactor/RootModuleInteractor.swift
View File

@ -44,7 +44,7 @@ protocol RootModuleInteracting: AnyObject {
)
func lockScreenActive()
func lockScreenInactive()
func lockScreenInactive()
}
final class RootModuleInteractor {
@ -57,6 +57,7 @@ final class RootModuleInteractor {
private let appStateInteractor: AppStateInteracting
private let notificationInteractor: NotificationInteracting
private let widgetsInteractor: WidgetsInteracting
private let localNotificationStateInteractor: LocalNotificationStateInteracting
init(
rootInteractor: RootInteracting,
@ -65,7 +66,8 @@ final class RootModuleInteractor {
registerDeviceInteractor: RegisterDeviceInteracting,
appStateInteractor: AppStateInteracting,
notificationInteractor: NotificationInteracting,
widgetsInteractor: WidgetsInteracting
widgetsInteractor: WidgetsInteracting,
localNotificationStateInteractor: LocalNotificationStateInteracting
) {
self.rootInteractor = rootInteractor
self.linkInteractor = linkInteractor
@ -74,6 +76,7 @@ final class RootModuleInteractor {
self.appStateInteractor = appStateInteractor
self.notificationInteractor = notificationInteractor
self.widgetsInteractor = widgetsInteractor
self.localNotificationStateInteractor = localNotificationStateInteractor
rootInteractor.storageError = { [weak self] error in
self?.storageError?(error)
@ -94,7 +97,7 @@ extension RootModuleInteractor: RootModuleInteracting {
rootInteractor.initializeApp()
registerDeviceInteractor.initialize()
}
func lockApplicationIfNeeded(presentLoginImmediately: @escaping () -> Void) {
rootInteractor.lockApplicationIfNeeded(
presentLoginImmediately: presentLoginImmediately
@ -120,6 +123,7 @@ extension RootModuleInteractor: RootModuleInteracting {
didCopyToken()
}
rootInteractor.applicationDidBecomeActive()
localNotificationStateInteractor.activate()
}
func shouldHandleURL(url: URL) -> Bool {

4
TwoFAS/TwoFAS/Root/Modules/Main/Flow/MainFlowController.swift
View File

@ -207,6 +207,10 @@ extension MainFlowController: MainSplitFlowControllerParent {
func navigationSwitchedToSettingsExternalImport() {
viewController.presenter.handleSwitchToExternalImport()
}
func navigationSwitchedToSettingsBackup() {
viewController.presenter.handleSwitchToBackup()
}
}
extension MainFlowController: NewPINNavigationFlowControllerParent {

10
TwoFAS/TwoFAS/Root/Modules/Main/Interactor/MainModuleInteractor.swift
View File

@ -30,7 +30,6 @@ protocol MainModuleInteracting: AnyObject {
func initialize()
func checkForImport() -> URL?
func clearImportedFileURL()
func refreshLocalNotifications()
func savePIN(_ PIN: String, ofType pinType: PINType)
func saveSuccessSync()
@ -65,7 +64,6 @@ final class MainModuleInteractor {
private let rootInteractor: RootInteracting
private let mdmInteractor: MDMInteracting
private let protectionInteractor: ProtectionInteracting
private let localNotificationStateInteractor: LocalNotificationStateInteracting
init(
logUploadingInteractor: LogUploadingInteracting,
@ -77,8 +75,7 @@ final class MainModuleInteractor {
appInfoInteractor: AppInfoInteracting,
rootInteractor: RootInteracting,
mdmInteractor: MDMInteracting,
protectionInteractor: ProtectionInteracting,
localNotificationStateInteractor: LocalNotificationStateInteracting
protectionInteractor: ProtectionInteracting
) {
self.logUploadingInteractor = logUploadingInteractor
self.cloudBackupStateInteractor = cloudBackupStateInteractor
@ -89,7 +86,6 @@ final class MainModuleInteractor {
self.rootInteractor = rootInteractor
self.mdmInteractor = mdmInteractor
self.protectionInteractor = protectionInteractor
self.localNotificationStateInteractor = localNotificationStateInteractor
cloudBackupStateInteractor.secretSyncError = { [weak self] in self?.secretSyncError?($0) }
}
@ -102,10 +98,6 @@ extension MainModuleInteractor: MainModuleInteracting {
appInfoInteractor.markDateOfFirstRunIfNeeded()
}
func refreshLocalNotifications() {
localNotificationStateInteractor.activate()
}
func checkForImport() -> URL? {
fileInteractor.url
}

9
TwoFAS/TwoFAS/Root/Modules/Main/Presenter/MainPresenter.swift
View File

@ -37,7 +37,6 @@ final class MainPresenter {
func viewDidLoad() {
interactor.initialize()
interactor.refreshLocalNotifications()
flowController.toSetupSplit()
}
@ -45,10 +44,6 @@ final class MainPresenter {
viewIsVisible()
}
func handleAppDidBecomeActive() {
interactor.refreshLocalNotifications()
}
func handleSwitchToSetupPIN() {
view?.navigateToViewPath(.settings(option: .security))
}
@ -61,6 +56,10 @@ final class MainPresenter {
view?.navigateToViewPath(.settings(option: .externalImport))
}
func handleSwitchToBackup() {
view?.navigateToViewPath(.settings(option: .backup))
}
func handleSwitchedToSettings() {
view?.settingsTabActive()
}

8
TwoFAS/TwoFAS/Root/Modules/Main/View/MainViewController.swift
View File

@ -63,7 +63,7 @@ extension MainViewController {
)
notificationCenter.addObserver(
self,
selector: #selector(appDidBecomeActive),
selector: #selector(refreshAuthList),
name: UIApplication.didBecomeActiveNotification,
object: nil
)
@ -128,12 +128,6 @@ extension MainViewController {
presenter.handleClearAuthList()
}
@objc
private func appDidBecomeActive() {
presenter.handleAppDidBecomeActive()
presenter.handleRefreshAuthList()
}
@objc
private func refreshAuthList() {
presenter.handleRefreshAuthList()

5
TwoFAS/TwoFAS/Root/Modules/MainSplit/Flow/MainSplitFlowController.swift
View File

@ -24,6 +24,7 @@ protocol MainSplitFlowControllerParent: AnyObject {
func navigationSwitchedToTokens()
func navigationSwitchedToSettings()
func navigationSwitchedToSettingsExternalImport()
func navigationSwitchedToSettingsBackup()
}
protocol MainSplitFlowControlling: AnyObject {
@ -175,6 +176,10 @@ extension MainSplitFlowController: TokensPlainFlowControllerParent {
func tokensSwitchToSettingsExternalImport() {
parent?.navigationSwitchedToSettingsExternalImport()
}
func tokensSwitchToSettingsBackup() {
parent?.navigationSwitchedToSettingsBackup()
}
}
extension MainSplitFlowController: SettingsFlowControllerParent {

5
TwoFAS/TwoFAS/Root/Modules/News/Flow/NewsNavigationFlowController.swift
View File

@ -22,6 +22,7 @@ import Common
protocol NewsNavigationFlowControllerParent: AnyObject {
func newsClose()
func newsToBackup()
}
final class NewsNavigationFlowController: NavigationFlowController {
@ -48,4 +49,8 @@ extension NewsNavigationFlowController: NewsPlainFlowControllerParent {
func newsClose() {
parent?.newsClose()
}
func newsToBackup() {
parent?.newsToBackup()
}
}

4
TwoFAS/TwoFAS/Root/Modules/News/Flow/NewsPlainFlowController.swift
View File

@ -22,6 +22,7 @@ import Common
protocol NewsPlainFlowControllerParent: AnyObject {
func newsClose()
func newsToBackup()
}
protocol NewsPlainFlowControlling: AnyObject {
@ -69,8 +70,7 @@ extension NewsPlainFlowController: NewsPlainFlowControlling {
func toInternalLink(_ internalLink: ListNewsEntry.InternalLink) {
switch internalLink {
case .backup:
print("to backup!")
// to backup!
parent?.newsToBackup()
}
}
}

8
TwoFAS/TwoFAS/Root/Modules/Tokens/Flow/TokensPlainFlowController.swift
View File

@ -25,6 +25,7 @@ import SwiftUI
protocol TokensPlainFlowControllerParent: AnyObject {
func tokensSwitchToTokensTab()
func tokensSwitchToSettingsExternalImport()
func tokensSwitchToSettingsBackup()
}
protocol TokensPlainFlowControlling: AnyObject {
@ -654,6 +655,13 @@ extension TokensPlainFlowController: NewsNavigationFlowControllerParent {
viewController.presenter.handleRefreshNewsStatus()
dismiss()
}
func newsToBackup() {
viewController.presenter.handleRefreshNewsStatus()
dismiss { [weak self] in
self?.parent?.tokensSwitchToSettingsBackup()
}
}
}
extension TokensPlainFlowController: GuideSelectorNavigationFlowControllerParent {

30
TwoFAS/TwoFAS/Root/Modules/Tokens/Presenter/TokensPresenter.swift
View File

@ -87,7 +87,7 @@ extension TokensPresenter {
interactor.sync()
appActiveActions()
interactor.fetchNews { [weak self] in
self?.updateAddNewsIcon()
self?.updateNewsIcon()
}
}
@ -446,7 +446,7 @@ extension TokensPresenter {
}
func handleRefreshNewsStatus() {
updateAddNewsIcon()
updateNewsIcon()
}
}
@ -532,7 +532,7 @@ private extension TokensPresenter {
}()
if interactor.hasServices {
updateAddNewsIcon()
updateNewsIcon()
view?.showList()
if Set<CategoryData>(currentServices) != Set<CategoryData>(newServices) || changeRequriesTokenRefresh {
@ -553,7 +553,7 @@ private extension TokensPresenter {
if !isSearching && currentState == .edit {
setCurrentState(.normal)
}
updateAddNewsIcon()
updateNewsIcon()
interactor.stopCounters()
updateEditStateButton()
@ -568,14 +568,6 @@ private extension TokensPresenter {
changeRequriesTokenRefresh = false
}
func updateAddNewsIcon() {
if interactor.hasServices {
view?.updateAddIcon(using: mapButtonStateFor(currentState, isFirst: false))
} else {
view?.updateAddIcon(using: mapButtonStateFor(currentState, isFirst: !isSearching))
}
}
func mapButtonStateFor(_ currentState: State, isFirst: Bool) -> TokensViewControllerAddState {
switch (currentState, isFirst) {
case (.edit, _):
@ -602,6 +594,20 @@ private extension TokensPresenter {
return .none
}
}
func updateNewsIcon() {
interactor.fetchNews { [weak self] in
self?.updateAddServiceIcon()
}
}
private func updateAddServiceIcon() {
if interactor.hasServices {
view?.updateAddIcon(using: mapButtonStateFor(currentState, isFirst: false))
} else {
view?.updateAddIcon(using: mapButtonStateFor(currentState, isFirst: !isSearching))
}
}
}
private extension TokensPresenter.State {