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-250 Working service fetch

Browse Source
This commit is contained in:
Zbigniew Cisiński 2024-03-21 13:01:50 +01:00
parent 02ed735ac0
commit fd43161aca
38 changed files with 687 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
TwoFAS/Data/ServiceMigration/ServiceMigrationController.swift
View File

@ -18,21 +18,30 @@
//
import Foundation
#if os(iOS)
import Storage
import Common
import Content
#elseif os(watchOS)
import CommonWatch
import ContentWatch
#endif
// Migrate to interactor when main architecture will be refactored
final class ServiceMigrationController {
public final class ServiceMigrationController {
private let migrationKey = "ServiceMigrationController"
private let storageRepository: StorageRepository
private var serviceDatabase: ServiceDefinitionDatabase?
init(storageRepository: StorageRepository) {
#if os(watchOS)
public var serviceNameTranslation: String?
#endif
public init(storageRepository: StorageRepository) {
self.storageRepository = storageRepository
}
func migrateIfNeeded() {
public func migrateIfNeeded() {
guard
let currentVersionString = Bundle.main.appVersion,
let currentVersion = currentVersionString.splitVersion()
@ -43,7 +52,9 @@ final class ServiceMigrationController {
if let sv = savedVersionString {
if sv < currentVersion {
#if os(iOS)
AppEventLog(.appUpdate(currentVersionString))
#endif
userDefaults.set(currentVersionString, forKey: migrationKey)
userDefaults.synchronize()
} else {
@ -75,9 +86,16 @@ final class ServiceMigrationController {
else { continue }
let name: String = {
#if os(iOS)
if s.name.contains(MainRepositoryImpl.shared.serviceNameTranslation) {
return def.name
}
#elseif os(watchOS)
if let serviceNameTranslation, s.name.contains(serviceNameTranslation) {
return def.name
}
#endif
return s.name
}()

4
TwoFAS/Storage/AuthRequest/AuthRequestEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(AuthRequestEntity)
final class AuthRequestEntity: NSManagedObject {

4
TwoFAS/Storage/AuthRequest/AuthRequestEntityToPairedAuthRequest.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension AuthRequestEntity {
var pairedAuthRequest: PairedAuthRequest {

4
TwoFAS/Storage/AuthRequest/AuthRequestFilterOptions.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
enum AuthRequestFilterOptions {
case domainExtension(domain: String, extensionID: ExtensionID)

4
TwoFAS/Storage/CategoryData.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public struct CategoryData: Equatable, Hashable {
public let section: SectionData?

4
TwoFAS/Storage/CategoryHandler.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public final class CategoryHandler {
private let sectionHandler: SectionHandler

5
TwoFAS/Storage/DynamicTypesEntityMigrationPolicy.swift
View File

@ -19,8 +19,13 @@
import Foundation
import CoreData
#if os(iOS)
import Common
import Content
#elseif os(watchOS)
import CommonWatch
import ContentWatch
#endif
@objc(DynamicTypesEntityMigrationPolicy)
final class DynamicTypesEntityMigrationPolicy: NSEntityMigrationPolicy {

4
TwoFAS/Storage/EncryptSecretEntityMigrationPolicy.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(EncryptSecretEntityMigrationPolicy)
final class EncryptSecretEntityMigrationPolicy: NSEntityMigrationPolicy {

4
TwoFAS/Storage/Extensions.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension Array where Element: Equatable {
mutating func move(_ element: Element, to newIndex: Index) {

4
TwoFAS/Storage/Log/LogEntry.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public struct LogEntry: Hashable {
public let content: String

4
TwoFAS/Storage/Log/LogEntryEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(LogEntryEntity)
final class LogEntryEntity: NSManagedObject {

8
TwoFAS/Storage/Log/LogHandler.swift
View File

@ -18,8 +18,12 @@
//
import Foundation
import Common
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public final class LogHandler: LogStorageHandling {
private struct CachedEntry {
@ -48,6 +52,7 @@ public final class LogHandler: LogStorageHandling {
context = coreDataStack.createBackgroundContext()
context.automaticallyMergesChangesFromParent = true
#if os(iOS)
NotificationCenter.default.addObserver(
self,
selector: #selector(save),
@ -66,6 +71,7 @@ public final class LogHandler: LogStorageHandling {
name: UIApplication.didEnterBackgroundNotification,
object: nil
)
#endif
}
public func markZoneStart() {

4
TwoFAS/Storage/News/NewsEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(NewsEntity)
final class NewsEntity: NSManagedObject {

4
TwoFAS/Storage/Pairing/PairingEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(PairingEntity)
final class PairingEntity: NSManagedObject {

4
TwoFAS/Storage/Section/SectionData.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public struct SectionData: Hashable {
public let title: String

4
TwoFAS/Storage/Section/SectionEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(SectionEntity)
final class SectionEntity: NSManagedObject {

4
TwoFAS/Storage/Section/SectionEntity+CoreDataProperties.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension SectionEntity {
@nonobjc static func request() -> NSFetchRequest<SectionEntity> {

4
TwoFAS/Storage/Section/SectionHandler.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public final class SectionHandler: CommonSectionHandler {
private let coreDataStack: CoreDataStack

4
TwoFAS/Storage/Service/ServiceData+Extensions.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension ServiceData {
static func createFromManagedObject(entity: ServiceEntity) -> ServiceData {

4
TwoFAS/Storage/Service/ServiceEntity+CoreDataClass.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
@objc(ServiceEntity)
final class ServiceEntity: NSManagedObject {

4
TwoFAS/Storage/Service/ServiceEntity+Extensions.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension Array where Element == ServiceEntity {
var groupByCategory: ServiceEntity.ServicesWithinSections {

4
TwoFAS/Storage/Service/ServiceHandler.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
// DEPRECATED - use Storage Repository
public final class ServiceHandler {

4
TwoFAS/Storage/Service/ServiceOptions.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public enum ServiceOptions {
public enum TrashOptions {

21
TwoFAS/Storage/Storage.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public final class Storage {
private let coreDataStack: CoreDataStack
@ -31,11 +35,9 @@ public final class Storage {
public init(readOnly: Bool = false, logError: ((String) -> Void)?) {
let packageName = "TwoFAS"
let bundle = Bundle(for: Storage.self)
coreDataStack = CoreDataStack(
readOnly: readOnly,
name: packageName,
bundle: bundle,
migrator: CoreDataMigrator(
let migrator: CoreDataMigratorProtocol? = {
#if os(iOS)
CoreDataMigrator(
momdSubdirectory: packageName,
versions: [
CoreDataMigrationVersion(rawValue: "TwoFAS"),
@ -47,6 +49,15 @@ public final class Storage {
CoreDataMigrationVersion(rawValue: "TwoFAS7")
]
)
#elseif os(watchOS)
return nil
#endif
}()
coreDataStack = CoreDataStack(
readOnly: readOnly,
name: packageName,
bundle: bundle,
migrator: migrator
)
coreDataStack.logError = logError

4
TwoFAS/Storage/StorageRepository.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
public protocol StorageRepository: AnyObject {
var hasServices: Bool { get }

4
TwoFAS/Storage/StorageRepositoryImpl+AuthRequest.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension StorageRepositoryImpl {
func removeAuthRequest(_ authRequest: PairedAuthRequest) {

4
TwoFAS/Storage/StorageRepositoryImpl+CategoriesSections.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension StorageRepositoryImpl {
func listAllSections() -> [SectionData] {

4
TwoFAS/Storage/StorageRepositoryImpl+News.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension StorageRepositoryImpl {
func createNewsEntry(from newsEntry: ListNewsEntry) {

6
TwoFAS/Storage/StorageRepositoryImpl+Pairing.swift
View File

@ -18,8 +18,12 @@
//
import Foundation
import Common
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
extension StorageRepositoryImpl {
func createPairing(name: String, extensionID: ExtensionID, publicKey: String) {

4
TwoFAS/Storage/StorageRepositoryImpl.swift
View File

@ -19,7 +19,11 @@
import Foundation
import CoreData
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
final class StorageRepositoryImpl: StorageRepository {
private let coreDataStack: CoreDataStack

60
TwoFAS/Storage/Watch/TwoFAS.xcdatamodeld/TwoFAS.xcdatamodel/contents Normal file
View File

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23C71" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="AuthRequestEntity" representedClassName="AuthRequestEntity" syncable="YES">
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="domain" attributeType="String"/>
<attribute name="extensionID" attributeType="String"/>
<attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="secret" attributeType="String"/>
<attribute name="usedCount" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
</entity>
<entity name="NewsEntity" representedClassName="NewsEntity" syncable="YES">
<attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="icon" attributeType="String"/>
<attribute name="link" optional="YES" attributeType="URI"/>
<attribute name="message" optional="YES" attributeType="String"/>
<attribute name="newsID" attributeType="String"/>
<attribute name="publishedAt" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="wasRead" attributeType="Boolean" usesScalarValueType="YES"/>
</entity>
<entity name="PairingEntity" representedClassName="PairingEntity" syncable="YES">
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="extensionID" attributeType="String"/>
<attribute name="modifcationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="name" attributeType="String"/>
<attribute name="publicKey" attributeType="String"/>
</entity>
<entity name="SectionEntity" representedClassName="SectionEntity" syncable="YES">
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="isCollapsed" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="modificationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="order" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="sectionID" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="title" attributeType="String"/>
</entity>
<entity name="ServiceEntity" representedClassName="ServiceEntity" syncable="YES">
<attribute name="additionalInfo" optional="YES" attributeType="String"/>
<attribute name="algorithm" attributeType="String"/>
<attribute name="badgeColor" optional="YES" attributeType="String"/>
<attribute name="counter" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="iconType" attributeType="String"/>
<attribute name="iconTypeID" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="isTrashed" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="labelColor" attributeType="String"/>
<attribute name="labelTitle" attributeType="String"/>
<attribute name="modificationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="name" attributeType="String"/>
<attribute name="otpAuth" optional="YES" attributeType="String"/>
<attribute name="rawIssuer" optional="YES" attributeType="String"/>
<attribute name="secret" attributeType="String"/>
<attribute name="sectionID" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="sectionOrder" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="serviceTypeID" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="source" attributeType="String"/>
<attribute name="tokenLength" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="tokenPeriod" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="tokenType" attributeType="String"/>
<attribute name="trashingDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
</entity>
</model>

4
TwoFAS/Sync/CommonItemHandler.swift
View File

@ -18,7 +18,11 @@
//
import Foundation
#if os(iOS)
import Common
#elseif os(watchOS)
import CommonWatch
#endif
final class CommonItemHandler {
private let commonSectionHandler: CommonSectionHandler

98
TwoFAS/Sync/CommonItemHandlerWatch.swift
View File

@ -1,98 +0,0 @@
//
// This file is part of the 2FAS iOS app (https://github.com/twofas/2fas-ios)
// Copyright © 2023 Two Factor Authentication Service, Inc.
// Contributed by Zbigniew Cisiński. All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>
//
import Foundation
import CommonWatch
final class CommonItemHandler {
init() {
// commonSectionHandler.commonDidCreate = { [weak self] sectionID in
// Log("CommonItemHandler - commonSectionHandler - commonDidCreate", module: .cloudSync)
// self?.logHandler.log(entityID: sectionID, actionType: .created, kind: .section)
// }
// commonSectionHandler.commonDidModify = { [weak self] sectionIDs in
// Log("CommonItemHandler - commonSectionHandler - commonDidModify", module: .cloudSync)
// sectionIDs.forEach {
// self?.logHandler.log(entityID: $0, actionType: .modified, kind: .section)
// }
// }
// commonSectionHandler.commonDidDelete = { [weak self] sectionID in
// Log("CommonItemHandler - commonSectionHandler - commonDidDelete", module: .cloudSync)
// self?.logHandler.log(entityID: sectionID, actionType: .deleted, kind: .section)
// }
//
// commonServiceHandler.commonDidCreate = { [weak self] secret in
// Log("CommonItemHandler - commonServiceHandler - commonDidCreate", module: .cloudSync)
// self?.logHandler.log(entityID: secret, actionType: .created, kind: .service2)
// }
// commonServiceHandler.commonDidModify = { [weak self] secrets in
// Log("CommonItemHandler - commonServiceHandler - commonDidModify", module: .cloudSync)
// secrets.forEach {
// self?.logHandler.log(entityID: $0, actionType: .modified, kind: .service2)
// }
// }
// commonServiceHandler.commonDidDelete = { [weak self] secret in
// Log("CommonItemHandler - commonServiceHandler - commonDidDelete", module: .cloudSync)
// self?.logHandler.log(entityID: secret, actionType: .deleted, kind: .service2)
// }
}
func logFirstImport() {
// logHandler.logFirstImport(entityIDs: commonSectionHandler.getAllSections().map { $0.sectionID }, kind: .section)
// logHandler.logFirstImport(entityIDs: commonServiceHandler.getAllServices().map { $0.secret }, kind: .service2)
// logHandler.logFirstImport(entityIDs: [Info.id], kind: .info)
}
func setItems(_ items: [RecordType: [Any]]) -> Bool {
// var newDataWasSet = false
//
// if let sections = items[.section] as? [CommonSectionData] {
// Log("CommonItemHandler: sections (\(sections.count))")
// let value = commonSectionHandler.setSections(sections)
// newDataWasSet = newDataWasSet || value
// }
//
// if let services = items[.service2] as? [ServiceData] {
// Log("CommonItemHandler: services (\(services.count))")
// let value = commonServiceHandler.setServices(services)
// newDataWasSet = newDataWasSet || value
// }
//
// return newDataWasSet
false
}
func setItemsFromMigration(_ serviceDataToAppend: [ServiceData]) {
// Log("CommonItemHandler: setting items from migration (\(serviceDataToAppend.count))")
// itemsToAppend = serviceDataToAppend
}
func getAllItems() -> [RecordType: [Any]] {
// let sections = commonSectionHandler.getAllSections()
// let services = commonServiceHandler.getAllServices() + itemsToAppend
// itemsToAppend = []
// var value = [RecordType: [Any]]()
// value[.section] = sections
// value[.service2] = services
// value[.info] = [Info()]
// return value
[:]
}
}

55
TwoFAS/Sync/SyncInstanceWatch.swift
View File

@ -23,13 +23,24 @@ import CommonWatch
public enum SyncInstanceWatch {
private static var cloudHandler: CloudHandlerType!
private static var logDataChangeImpl: LogDataChangeImpl!
public static func initialize() {
public static func initialize(
commonSectionHandler: CommonSectionHandler,
commonServiceHandler: CommonServiceHandler,
errorLog: @escaping (String) -> Void
) {
coreDataStack.logError = { errorLog($0) }
let logHandler = LogHandler(coreDataStack: coreDataStack)
let sectionHandler = SectionHandler(coreDataStack: coreDataStack)
let serviceHandler = ServiceHandler(coreDataStack: coreDataStack)
let infoHandler = InfoHandler()
let commonItemHandler = CommonItemHandler()
let commonItemHandler = CommonItemHandler(
commonSectionHandler: commonSectionHandler,
commonServiceHandler: commonServiceHandler,
logHandler: logHandler
)
let cloudKit = CloudKit()
let itemHandler = ItemHandler(
@ -56,42 +67,24 @@ public enum SyncInstanceWatch {
cloudKit: cloudKit
)
logDataChangeImpl = LogDataChangeImpl(logHandler: logHandler)
}
public static func getCloudHandler() -> CloudHandlerType { cloudHandler }
public static var logDataChange: LogDataChange {
logDataChangeImpl
}
public static func migrateStoreIfNeeded() {
coreDataStack.performInBackground { context in
Log("Migrating if needed. Trigger value \(context.hasChanges)", module: .cloudSync)
}
}
public static func getCloudHandler() -> CloudHandlerType { cloudHandler }
private static let coreDataStack = CoreDataStack(
readOnly: false,
name: "Sync",
bundle: Bundle(for: SyncHandler.self),
migrator: CoreDataMigrator(
momdSubdirectory: "Sync",
versions: [
CoreDataMigrationVersion(rawValue: "Sync"),
CoreDataMigrationVersion(rawValue: "Sync2"),
CoreDataMigrationVersion(rawValue: "Sync3"),
CoreDataMigrationVersion(rawValue: "Sync4"),
CoreDataMigrationVersion(rawValue: "Sync5")
]) { _, toVersion in
if toVersion.rawValue == "Sync5" {
Log("Migrating to Sync5!", module: .cloudSync)
SyncInstanceWatch.cloudHandler.resetStateBeforeSync()
}
}
migrator: nil
)
}
private final class CommonServiceHandlerImpl: CommonServiceHandler {
var commonDidDelete: CommonDidDelete?
var commonDidModify: CommonDidModify?
var commonDidCreate: CommonDidCreate?
func setServices(_ servicesservices: [ServiceData]) -> Bool {
false
}
func getAllServices() -> [ServiceData] {
[]
}
}

42
TwoFAS/Sync/Watch/Sync.xcdatamodeld/Sync.xcdatamodel/contents Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23C71" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="LogEntity" representedClassName="LogEntity" syncable="YES">
<attribute name="action" attributeType="String"/>
<attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="entityID" attributeType="String"/>
<attribute name="isApplied" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="kind" attributeType="String"/>
</entity>
<entity name="SectionCacheEntity" representedClassName="SectionCacheEntity" syncable="YES">
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="metadata" attributeType="Binary"/>
<attribute name="modificationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="order" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="sectionID" attributeType="String"/>
<attribute name="title" attributeType="String"/>
</entity>
<entity name="ServiceCacheEntity" representedClassName="ServiceCacheEntity" syncable="YES">
<attribute name="additionalInfo" optional="YES" attributeType="String"/>
<attribute name="algorithm" attributeType="String"/>
<attribute name="badgeColor" optional="YES" attributeType="String"/>
<attribute name="counter" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="creationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="iconType" attributeType="String"/>
<attribute name="iconTypeID" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="labelColor" attributeType="String"/>
<attribute name="labelTitle" attributeType="String"/>
<attribute name="metadata" attributeType="Binary"/>
<attribute name="modificationDate" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="name" attributeType="String"/>
<attribute name="otpAuth" optional="YES" attributeType="String"/>
<attribute name="rawIssuer" optional="YES" attributeType="String"/>
<attribute name="secret" attributeType="String"/>
<attribute name="sectionID" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="sectionOrder" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="serviceTypeID" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="source" attributeType="String"/>
<attribute name="tokenLength" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="tokenPeriod" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="tokenType" attributeType="String"/>
</entity>
</model>

323
TwoFAS/TwoFAS.xcodeproj/project.pbxproj
View File

@ -73,6 +73,50 @@
C21247F827B70D420044D9F2 /* LabelComposeFlowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C21247F727B70D420044D9F2 /* LabelComposeFlowController.swift */; };
C21247FB27B7181A0044D9F2 /* ComposeServiceModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = C21247FA27B7181A0044D9F2 /* ComposeServiceModels.swift */; };
C212ACDE2AF6F929001C8665 /* RootInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C212ACDD2AF6F929001C8665 /* RootInteractor.swift */; };
C213BC192BAC3BD5000794C9 /* CommonItemHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24EECF926878C5C00C6ABAA /* CommonItemHandler.swift */; };
C213BC202BAC3C82000794C9 /* Storage.h in Headers */ = {isa = PBXBuildFile; fileRef = C200E49C1FB3911B00D7C748 /* Storage.h */; settings = {ATTRIBUTES = (Public, ); }; };
C213BC232BAC3C82000794C9 /* StorageRepositoryImpl+CategoriesSections.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2BDF4512868B39000D46FA4 /* StorageRepositoryImpl+CategoriesSections.swift */; };
C213BC242BAC3C82000794C9 /* CategoryData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22C1398267682B4001AA5F1 /* CategoryData.swift */; };
C213BC252BAC3C82000794C9 /* StorageRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27ABD30277A450C00AE073B /* StorageRepository.swift */; };
C213BC262BAC3C82000794C9 /* StorageRepositoryImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27ABD32277A453000AE073B /* StorageRepositoryImpl.swift */; };
C213BC272BAC3C82000794C9 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B3D1A7267E6BEC009E6DE0 /* Extensions.swift */; };
C213BC292BAC3C82000794C9 /* StorageRepositoryImpl+AuthRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FA3E7C280ADCC90097ED71 /* StorageRepositoryImpl+AuthRequest.swift */; };
C213BC2A2BAC3C82000794C9 /* ServiceHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C200E4AA1FB3913A00D7C748 /* ServiceHandler.swift */; };
C213BC2C2BAC3C82000794C9 /* EncryptSecretEntityMigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20F00AF256946930026FBB2 /* EncryptSecretEntityMigrationPolicy.swift */; };
C213BC2D2BAC3C82000794C9 /* StorageRepositoryImpl+Pairing.swift in Sources */ = {isa = PBXBuildFile; fileRef = C258594E280374F4002DC749 /* StorageRepositoryImpl+Pairing.swift */; };
C213BC2E2BAC3C82000794C9 /* StorageRepositoryImpl+News.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D39DE22823302200E864E9 /* StorageRepositoryImpl+News.swift */; };
C213BC2F2BAC3C82000794C9 /* LogEntryEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22CF3E127414073004F6A03 /* LogEntryEntity+CoreDataClass.swift */; };
C213BC302BAC3C82000794C9 /* PairingEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C258594428034E85002DC749 /* PairingEntity+CoreDataClass.swift */; };
C213BC312BAC3C82000794C9 /* AuthRequestEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C258594A28035205002DC749 /* AuthRequestEntity+CoreDataClass.swift */; };
C213BC322BAC3C82000794C9 /* LogEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22CF3E5274143A1004F6A03 /* LogEntry.swift */; };
C213BC332BAC3C82000794C9 /* CategoryHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22C139A267684DC001AA5F1 /* CategoryHandler.swift */; };
C213BC342BAC3C82000794C9 /* SectionEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25E8993266402AD00A60CE5 /* SectionEntity+CoreDataProperties.swift */; };
C213BC352BAC3C82000794C9 /* ServiceOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2872DDF27A6EFB0000F5AE9 /* ServiceOptions.swift */; };
C213BC362BAC3C82000794C9 /* AuthRequestFilterOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FA3E7A280AD60D0097ED71 /* AuthRequestFilterOptions.swift */; };
C213BC372BAC3C82000794C9 /* NewsEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D39DDB28232A4E00E864E9 /* NewsEntity+CoreDataClass.swift */; };
C213BC382BAC3C82000794C9 /* ServiceEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27FBA4B1FBA23DD00D424D8 /* ServiceEntity+CoreDataProperties.swift */; };
C213BC392BAC3C82000794C9 /* LogHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22CF3E727416271004F6A03 /* LogHandler.swift */; };
C213BC3A2BAC3C82000794C9 /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C200E4AD1FB3913A00D7C748 /* Storage.swift */; };
C213BC3B2BAC3C82000794C9 /* LogStorage.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C22CF3DD27413F0F004F6A03 /* LogStorage.xcdatamodeld */; };
C213BC3C2BAC3C82000794C9 /* NewsEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D39DDC28232A4E00E864E9 /* NewsEntity+CoreDataProperties.swift */; };
C213BC3D2BAC3C82000794C9 /* DynamicTypesEntityMigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2AB25D928E0BF7B001CF6B3 /* DynamicTypesEntityMigrationPolicy.swift */; };
C213BC3E2BAC3C82000794C9 /* AuthRequestEntityToPairedAuthRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FA3E7E280ADDB40097ED71 /* AuthRequestEntityToPairedAuthRequest.swift */; };
C213BC402BAC3C82000794C9 /* ServiceEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27FBA471FBA239600D424D8 /* ServiceEntity+CoreDataClass.swift */; };
C213BC412BAC3C82000794C9 /* SectionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2DEC7A226767B28006DB1E6 /* SectionHandler.swift */; };
C213BC422BAC3C82000794C9 /* AuthRequestEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C258594B28035205002DC749 /* AuthRequestEntity+CoreDataProperties.swift */; };
C213BC432BAC3C82000794C9 /* SectionEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25E8992266402AD00A60CE5 /* SectionEntity+CoreDataClass.swift */; };
C213BC442BAC3C82000794C9 /* ServiceEntity+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2872DDD27A6DF48000F5AE9 /* ServiceEntity+Extensions.swift */; };
C213BC452BAC3C82000794C9 /* SectionData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25E898F2663F11900A60CE5 /* SectionData.swift */; };
C213BC462BAC3C82000794C9 /* LogEntryEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22CF3E227414073004F6A03 /* LogEntryEntity+CoreDataProperties.swift */; };
C213BC472BAC3C82000794C9 /* PairingEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C258594528034E85002DC749 /* PairingEntity+CoreDataProperties.swift */; };
C213BC482BAC3C82000794C9 /* ServiceData+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2BDC65C1FBB87C200967D0E /* ServiceData+Extensions.swift */; };
C213BC522BAC3C97000794C9 /* CommonWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C274CA232BAB8B92008E7212 /* CommonWatch.framework */; };
C213BC562BAC3C97000794C9 /* ContentWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C274CA492BAB8BE3008E7212 /* ContentWatch.framework */; };
C213BC5B2BAC3DBF000794C9 /* StorageWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C213BC502BAC3C82000794C9 /* StorageWatch.framework */; };
C213BC5C2BAC3DBF000794C9 /* StorageWatch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C213BC502BAC3C82000794C9 /* StorageWatch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C213BC602BAC3FE3000794C9 /* ServiceMigrationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2ACF9DE20A8A30E003E0987 /* ServiceMigrationController.swift */; };
C213BC702BAC5758000794C9 /* TwoFAS.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C213BC6E2BAC5758000794C9 /* TwoFAS.xcdatamodeld */; };
C213BC732BAC5771000794C9 /* Sync.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C213BC712BAC5771000794C9 /* Sync.xcdatamodeld */; };
C2147CB9205D78600001D011 /* Protection.h in Headers */ = {isa = PBXBuildFile; fileRef = C2147CB7205D78600001D011 /* Protection.h */; settings = {ATTRIBUTES = (Public, ); }; };
C2147CBC205D78600001D011 /* Protection.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2147CB5205D78600001D011 /* Protection.framework */; };
C2147CBD205D78600001D011 /* Protection.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C2147CB5205D78600001D011 /* Protection.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@ -419,7 +463,6 @@
C274C99E2BAB89C7008E7212 /* CloudKitErrorParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C207C11E2559F1CB0053975E /* CloudKitErrorParser.swift */; };
C274C99F2BAB89C7008E7212 /* SectionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24EECF5268787B400C6ABAA /* SectionHandler.swift */; };
C274C9A02BAB89C7008E7212 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F543DC25672E7600611716 /* Types.swift */; };
C274C9A12BAB89C7008E7212 /* Sync2-Sync3.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = C244EF13268685BC0040A58F /* Sync2-Sync3.xcmappingmodel */; };
C274C9A22BAB89C7008E7212 /* CloudHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D507B5256477DA00151359 /* CloudHandler.swift */; };
C274C9A32BAB89C7008E7212 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C244EF10268674650040A58F /* Extensions.swift */; };
C274C9A42BAB89C7008E7212 /* LogHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D61E512560393000C5BE3A /* LogHandler.swift */; };
@ -432,7 +475,6 @@
C274C9AB2BAB89C7008E7212 /* CloudAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2EF21D625630C9D0075743D /* CloudAvailability.swift */; };
C274C9AC2BAB89C7008E7212 /* ServiceCacheEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2EF402425582AFB0006735E /* ServiceCacheEntity+CoreDataClass.swift */; };
C274C9AD2BAB89C7008E7212 /* DynamicTypesEntityMigrationPolicySync.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27E6FAE28FC57FD00AC9FD1 /* DynamicTypesEntityMigrationPolicySync.swift */; };
C274C9AF2BAB89C7008E7212 /* Sync.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C2EF401325582A7C0006735E /* Sync.xcdatamodeld */; };
C274C9B12BAB89C7008E7212 /* ServiceRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2EF3F6D25575D730006735E /* ServiceRecord.swift */; };
C274C9B22BAB89C7008E7212 /* iCloudIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D75D36297D51B60002531E /* iCloudIdentifier.swift */; };
C274C9B32BAB89C7008E7212 /* ServiceCacheEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2EF402525582AFB0006735E /* ServiceCacheEntity+CoreDataProperties.swift */; };
@ -441,7 +483,6 @@
C274C9B62BAB89C7008E7212 /* SyncHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23BAAF32545A1E9009B1EF8 /* SyncHandler.swift */; };
C274C9B72BAB89C7008E7212 /* SectionRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24EECF32687837D00C6ABAA /* SectionRecord.swift */; };
C274C9B82BAB89C7008E7212 /* LogEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D61E2F25602F4100C5BE3A /* LogEntity+CoreDataClass.swift */; };
C274C9B92BAB89C7008E7212 /* Sync4-Sync5.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = C26A5FE2290475EA00A5A620 /* Sync4-Sync5.xcmappingmodel */; };
C274C9BA2BAB89C7008E7212 /* InfoRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27E6FB228FC87AD00AC9FD1 /* InfoRecord.swift */; };
C274C9BB2BAB89C7008E7212 /* InfoHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2C4F64A28FE08EB00285B81 /* InfoHandler.swift */; };
C274C9BC2BAB89C7008E7212 /* Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27E6FB528FC8B0000AC9FD1 /* Info.swift */; };
@ -563,7 +604,6 @@
C274CA972BAB8FD8008E7212 /* Protection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2147CC2205D78790001D011 /* Protection.swift */; };
C274CA982BAB91E3008E7212 /* ExchangeFileEncryption.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F6AF3F273056010015BC59 /* ExchangeFileEncryption.swift */; };
C274CA9B2BAB94B8008E7212 /* SyncInstanceWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C274CA992BAB94B3008E7212 /* SyncInstanceWatch.swift */; };
C274CA9F2BAB9749008E7212 /* CommonItemHandlerWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C274CA9C2BAB96FB008E7212 /* CommonItemHandlerWatch.swift */; };
C274CAA32BAB9D5E008E7212 /* ItemHandlerMigrationProxyWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C274CAA12BAB9D59008E7212 /* ItemHandlerMigrationProxyWatch.swift */; };
C276D1712B9A672C008C9CD4 /* LocalNotificationStateInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C276D1702B9A672C008C9CD4 /* LocalNotificationStateInteractor.swift */; };
C277C32C245C3FD6009214F3 /* MainContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C277C32B245C3FD6009214F3 /* MainContainerViewController.swift */; };
@ -1263,6 +1303,27 @@
remoteGlobalIDString = C200E4991FB3911B00D7C748;
remoteInfo = Storage;
};
C213BC542BAC3C97000794C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C236666B1FB2644900989ACA /* Project object */;
proxyType = 1;
remoteGlobalIDString = C274C9E42BAB8B92008E7212;
remoteInfo = CommonWatch;
};
C213BC582BAC3C97000794C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C236666B1FB2644900989ACA /* Project object */;
proxyType = 1;
remoteGlobalIDString = C274CA242BAB8BE3008E7212;
remoteInfo = ContentWatch;
};
C213BC5D2BAC3DBF000794C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C236666B1FB2644900989ACA /* Project object */;
proxyType = 1;
remoteGlobalIDString = C213BC1A2BAC3C82000794C9;
remoteInfo = StorageWatch;
};
C2147CBA205D78600001D011 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C236666B1FB2644900989ACA /* Project object */;
@ -1742,6 +1803,7 @@
C274CA892BAB8CBD008E7212 /* CommonWatch.framework in Embed Frameworks */,
C274CA8D2BAB8CC0008E7212 /* ContentWatch.framework in Embed Frameworks */,
C274CA912BAB8CC5008E7212 /* ProtectionWatch.framework in Embed Frameworks */,
C213BC5C2BAC3DBF000794C9 /* StorageWatch.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -1846,6 +1908,9 @@
C21247F727B70D420044D9F2 /* LabelComposeFlowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelComposeFlowController.swift; sourceTree = "<group>"; };
C21247FA27B7181A0044D9F2 /* ComposeServiceModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeServiceModels.swift; sourceTree = "<group>"; };
C212ACDD2AF6F929001C8665 /* RootInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootInteractor.swift; sourceTree = "<group>"; };
C213BC502BAC3C82000794C9 /* StorageWatch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = StorageWatch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C213BC6F2BAC5758000794C9 /* TwoFAS.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TwoFAS.xcdatamodel; sourceTree = "<group>"; };
C213BC722BAC5771000794C9 /* Sync.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Sync.xcdatamodel; sourceTree = "<group>"; };
C2147CB5205D78600001D011 /* Protection.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Protection.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C2147CB7205D78600001D011 /* Protection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Protection.h; sourceTree = "<group>"; };
C2147CB8205D78600001D011 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -2244,7 +2309,6 @@
C274CA7C2BAB8C3F008E7212 /* ProtectionWatch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ProtectionWatch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C274CA942BAB8F92008E7212 /* Protection+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Protection+.swift"; sourceTree = "<group>"; };
C274CA992BAB94B3008E7212 /* SyncInstanceWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncInstanceWatch.swift; sourceTree = "<group>"; };
C274CA9C2BAB96FB008E7212 /* CommonItemHandlerWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommonItemHandlerWatch.swift; sourceTree = "<group>"; };
C274CAA02BAB98A5008E7212 /* TwoFASWatch Watch App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "TwoFASWatch Watch App.entitlements"; sourceTree = "<group>"; };
C274CAA12BAB9D59008E7212 /* ItemHandlerMigrationProxyWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemHandlerMigrationProxyWatch.swift; sourceTree = "<group>"; };
C276D1702B9A672C008C9CD4 /* LocalNotificationStateInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotificationStateInteractor.swift; sourceTree = "<group>"; };
@ -2904,6 +2968,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C213BC492BAC3C82000794C9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C213BC562BAC3C97000794C9 /* ContentWatch.framework in Frameworks */,
C213BC522BAC3C97000794C9 /* CommonWatch.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
C2147CB1205D78600001D011 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -2986,6 +3059,7 @@
C274CA882BAB8CBD008E7212 /* CommonWatch.framework in Frameworks */,
C274CA8C2BAB8CC0008E7212 /* ContentWatch.framework in Frameworks */,
C274CA902BAB8CC5008E7212 /* ProtectionWatch.framework in Frameworks */,
C213BC5B2BAC3DBF000794C9 /* StorageWatch.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -3156,6 +3230,7 @@
C200E49B1FB3911B00D7C748 /* Storage */ = {
isa = PBXGroup;
children = (
C213BC612BAC4777000794C9 /* Watch */,
C200E4AD1FB3913A00D7C748 /* Storage.swift */,
C27ABD30277A450C00AE073B /* StorageRepository.swift */,
C27ABD32277A453000AE073B /* StorageRepositoryImpl.swift */,
@ -3748,6 +3823,22 @@
path = Modules;
sourceTree = "<group>";
};
C213BC612BAC4777000794C9 /* Watch */ = {
isa = PBXGroup;
children = (
C213BC6E2BAC5758000794C9 /* TwoFAS.xcdatamodeld */,
);
path = Watch;
sourceTree = "<group>";
};
C213BC652BAC4883000794C9 /* Watch */ = {
isa = PBXGroup;
children = (
C213BC712BAC5771000794C9 /* Sync.xcdatamodeld */,
);
path = Watch;
sourceTree = "<group>";
};
C2147CB6205D78600001D011 /* Protection */ = {
isa = PBXGroup;
children = (
@ -4401,6 +4492,7 @@
C274CA232BAB8B92008E7212 /* CommonWatch.framework */,
C274CA492BAB8BE3008E7212 /* ContentWatch.framework */,
C274CA7C2BAB8C3F008E7212 /* ProtectionWatch.framework */,
C213BC502BAC3C82000794C9 /* StorageWatch.framework */,
);
name = Products;
sourceTree = "<group>";
@ -4947,6 +5039,7 @@
C24D1C1B253C744E0029D27D /* Sync */ = {
isa = PBXGroup;
children = (
C213BC652BAC4883000794C9 /* Watch */,
C2F5443425685C2100611716 /* SyncInstance.swift */,
C274CA992BAB94B3008E7212 /* SyncInstanceWatch.swift */,
C2D507B5256477DA00151359 /* CloudHandler.swift */,
@ -4955,7 +5048,6 @@
C23BAB132545AEF5009B1EF8 /* ConstStorage.swift */,
C2EF21D625630C9D0075743D /* CloudAvailability.swift */,
C24EECF926878C5C00C6ABAA /* CommonItemHandler.swift */,
C274CA9C2BAB96FB008E7212 /* CommonItemHandlerWatch.swift */,
C2A7ABF1286328E60085CFEF /* SyncTokenHandler.swift */,
C2EFCE0625D05E320031293F /* ClearHandler.swift */,
C2C4F64528FDEF6C00285B81 /* Item */,
@ -7919,6 +8011,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C213BC1F2BAC3C82000794C9 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C213BC202BAC3C82000794C9 /* Storage.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
C2147CB2205D78600001D011 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@ -8057,6 +8157,28 @@
productReference = C200E49A1FB3911B00D7C748 /* Storage.framework */;
productType = "com.apple.product-type.framework";
};
C213BC1A2BAC3C82000794C9 /* StorageWatch */ = {
isa = PBXNativeTarget;
buildConfigurationList = C213BC4D2BAC3C82000794C9 /* Build configuration list for PBXNativeTarget "StorageWatch" */;
buildPhases = (
C213BC1F2BAC3C82000794C9 /* Headers */,
C213BC212BAC3C82000794C9 /* Sources */,
C213BC492BAC3C82000794C9 /* Frameworks */,
C213BC4C2BAC3C82000794C9 /* Resources */,
);
buildRules = (
);
dependencies = (
C213BC552BAC3C97000794C9 /* PBXTargetDependency */,
C213BC592BAC3C97000794C9 /* PBXTargetDependency */,
);
name = StorageWatch;
packageProductDependencies = (
);
productName = Storage;
productReference = C213BC502BAC3C82000794C9 /* StorageWatch.framework */;
productType = "com.apple.product-type.framework";
};
C2147CB4205D78600001D011 /* Protection */ = {
isa = PBXNativeTarget;
buildConfigurationList = C2147CC0205D78600001D011 /* Build configuration list for PBXNativeTarget "Protection" */;
@ -8243,6 +8365,7 @@
C274CA8B2BAB8CBD008E7212 /* PBXTargetDependency */,
C274CA8F2BAB8CC0008E7212 /* PBXTargetDependency */,
C274CA932BAB8CC5008E7212 /* PBXTargetDependency */,
C213BC5E2BAC3DBF000794C9 /* PBXTargetDependency */,
);
name = "TwoFASWatch Watch App";
productName = "TwoFASWatch Watch App";
@ -8715,6 +8838,7 @@
C274C9E42BAB8B92008E7212 /* CommonWatch */,
C274CA242BAB8BE3008E7212 /* ContentWatch */,
C274CA582BAB8C3F008E7212 /* ProtectionWatch */,
C213BC1A2BAC3C82000794C9 /* StorageWatch */,
);
};
/* End PBXProject section */
@ -8727,6 +8851,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C213BC4C2BAC3C82000794C9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
C2147CB3205D78600001D011 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@ -8984,6 +9115,50 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C213BC212BAC3C82000794C9 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C213BC232BAC3C82000794C9 /* StorageRepositoryImpl+CategoriesSections.swift in Sources */,
C213BC242BAC3C82000794C9 /* CategoryData.swift in Sources */,
C213BC252BAC3C82000794C9 /* StorageRepository.swift in Sources */,
C213BC262BAC3C82000794C9 /* StorageRepositoryImpl.swift in Sources */,
C213BC272BAC3C82000794C9 /* Extensions.swift in Sources */,
C213BC292BAC3C82000794C9 /* StorageRepositoryImpl+AuthRequest.swift in Sources */,
C213BC2A2BAC3C82000794C9 /* ServiceHandler.swift in Sources */,
C213BC2C2BAC3C82000794C9 /* EncryptSecretEntityMigrationPolicy.swift in Sources */,
C213BC2D2BAC3C82000794C9 /* StorageRepositoryImpl+Pairing.swift in Sources */,
C213BC2E2BAC3C82000794C9 /* StorageRepositoryImpl+News.swift in Sources */,
C213BC2F2BAC3C82000794C9 /* LogEntryEntity+CoreDataClass.swift in Sources */,
C213BC302BAC3C82000794C9 /* PairingEntity+CoreDataClass.swift in Sources */,
C213BC312BAC3C82000794C9 /* AuthRequestEntity+CoreDataClass.swift in Sources */,
C213BC322BAC3C82000794C9 /* LogEntry.swift in Sources */,
C213BC332BAC3C82000794C9 /* CategoryHandler.swift in Sources */,
C213BC342BAC3C82000794C9 /* SectionEntity+CoreDataProperties.swift in Sources */,
C213BC352BAC3C82000794C9 /* ServiceOptions.swift in Sources */,
C213BC702BAC5758000794C9 /* TwoFAS.xcdatamodeld in Sources */,
C213BC602BAC3FE3000794C9 /* ServiceMigrationController.swift in Sources */,
C213BC362BAC3C82000794C9 /* AuthRequestFilterOptions.swift in Sources */,
C213BC372BAC3C82000794C9 /* NewsEntity+CoreDataClass.swift in Sources */,
C213BC382BAC3C82000794C9 /* ServiceEntity+CoreDataProperties.swift in Sources */,
C213BC392BAC3C82000794C9 /* LogHandler.swift in Sources */,
C213BC3A2BAC3C82000794C9 /* Storage.swift in Sources */,
C213BC3B2BAC3C82000794C9 /* LogStorage.xcdatamodeld in Sources */,
C213BC3C2BAC3C82000794C9 /* NewsEntity+CoreDataProperties.swift in Sources */,
C213BC3D2BAC3C82000794C9 /* DynamicTypesEntityMigrationPolicy.swift in Sources */,
C213BC3E2BAC3C82000794C9 /* AuthRequestEntityToPairedAuthRequest.swift in Sources */,
C213BC402BAC3C82000794C9 /* ServiceEntity+CoreDataClass.swift in Sources */,
C213BC412BAC3C82000794C9 /* SectionHandler.swift in Sources */,
C213BC422BAC3C82000794C9 /* AuthRequestEntity+CoreDataProperties.swift in Sources */,
C213BC432BAC3C82000794C9 /* SectionEntity+CoreDataClass.swift in Sources */,
C213BC442BAC3C82000794C9 /* ServiceEntity+Extensions.swift in Sources */,
C213BC452BAC3C82000794C9 /* SectionData.swift in Sources */,
C213BC462BAC3C82000794C9 /* LogEntryEntity+CoreDataProperties.swift in Sources */,
C213BC472BAC3C82000794C9 /* PairingEntity+CoreDataProperties.swift in Sources */,
C213BC482BAC3C82000794C9 /* ServiceData+Extensions.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
C2147CB0205D78600001D011 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -9704,10 +9879,10 @@
C274C99C2BAB89C7008E7212 /* ServiceCacheEntity+toServiceData.swift in Sources */,
C274C99D2BAB89C7008E7212 /* ConstStorage.swift in Sources */,
C274C99E2BAB89C7008E7212 /* CloudKitErrorParser.swift in Sources */,
C213BC192BAC3BD5000794C9 /* CommonItemHandler.swift in Sources */,
C274CAA32BAB9D5E008E7212 /* ItemHandlerMigrationProxyWatch.swift in Sources */,
C274C99F2BAB89C7008E7212 /* SectionHandler.swift in Sources */,
C274C9A02BAB89C7008E7212 /* Types.swift in Sources */,
C274C9A12BAB89C7008E7212 /* Sync2-Sync3.xcmappingmodel in Sources */,
C274C9A22BAB89C7008E7212 /* CloudHandler.swift in Sources */,
C274C9A32BAB89C7008E7212 /* Extensions.swift in Sources */,
C274C9A42BAB89C7008E7212 /* LogHandler.swift in Sources */,
@ -9720,7 +9895,6 @@
C274C9AB2BAB89C7008E7212 /* CloudAvailability.swift in Sources */,
C274C9AC2BAB89C7008E7212 /* ServiceCacheEntity+CoreDataClass.swift in Sources */,
C274C9AD2BAB89C7008E7212 /* DynamicTypesEntityMigrationPolicySync.swift in Sources */,
C274C9AF2BAB89C7008E7212 /* Sync.xcdatamodeld in Sources */,
C274C9B12BAB89C7008E7212 /* ServiceRecord.swift in Sources */,
C274C9B22BAB89C7008E7212 /* iCloudIdentifier.swift in Sources */,
C274C9B32BAB89C7008E7212 /* ServiceCacheEntity+CoreDataProperties.swift in Sources */,
@ -9729,10 +9903,9 @@
C274C9B62BAB89C7008E7212 /* SyncHandler.swift in Sources */,
C274C9B72BAB89C7008E7212 /* SectionRecord.swift in Sources */,
C274C9B82BAB89C7008E7212 /* LogEntity+CoreDataClass.swift in Sources */,
C274C9B92BAB89C7008E7212 /* Sync4-Sync5.xcmappingmodel in Sources */,
C213BC732BAC5771000794C9 /* Sync.xcdatamodeld in Sources */,
C274C9BA2BAB89C7008E7212 /* InfoRecord.swift in Sources */,
C274C9BB2BAB89C7008E7212 /* InfoHandler.swift in Sources */,
C274CA9F2BAB9749008E7212 /* CommonItemHandlerWatch.swift in Sources */,
C274C9BC2BAB89C7008E7212 /* Info.swift in Sources */,
C274C9BD2BAB89C7008E7212 /* RecordIDGenerator.swift in Sources */,
C274CA9B2BAB94B8008E7212 /* SyncInstanceWatch.swift in Sources */,
@ -10208,6 +10381,21 @@
target = C200E4991FB3911B00D7C748 /* Storage */;
targetProxy = C200E49F1FB3911B00D7C748 /* PBXContainerItemProxy */;
};
C213BC552BAC3C97000794C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C274C9E42BAB8B92008E7212 /* CommonWatch */;
targetProxy = C213BC542BAC3C97000794C9 /* PBXContainerItemProxy */;
};
C213BC592BAC3C97000794C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C274CA242BAB8BE3008E7212 /* ContentWatch */;
targetProxy = C213BC582BAC3C97000794C9 /* PBXContainerItemProxy */;
};
C213BC5E2BAC3DBF000794C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C213BC1A2BAC3C82000794C9 /* StorageWatch */;
targetProxy = C213BC5D2BAC3DBF000794C9 /* PBXContainerItemProxy */;
};
C2147CBB205D78600001D011 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C2147CB4205D78600001D011 /* Protection */;
@ -10729,6 +10917,90 @@
};
name = Release;
};
C213BC4E2BAC3C82000794C9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.3.5;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.StorageWatch;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchos watchsimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
C213BC4F2BAC3C82000794C9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.3.5;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.StorageWatch;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchos watchsimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
C2147CBE205D78600001D011 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -12686,6 +12958,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C213BC4D2BAC3C82000794C9 /* Build configuration list for PBXNativeTarget "StorageWatch" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C213BC4E2BAC3C82000794C9 /* Debug */,
C213BC4F2BAC3C82000794C9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C2147CC0205D78600001D011 /* Build configuration list for PBXNativeTarget "Protection" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@ -13039,6 +13320,28 @@
/* End XCSwiftPackageProductDependency section */
/* Begin XCVersionGroup section */
C213BC6E2BAC5758000794C9 /* TwoFAS.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
C213BC6F2BAC5758000794C9 /* TwoFAS.xcdatamodel */,
);
currentVersion = C213BC6F2BAC5758000794C9 /* TwoFAS.xcdatamodel */;
name = TwoFAS.xcdatamodeld;
path = /Users/adocyn/Documents/Projects/2FAS/TwoFAS/Storage/Watch/TwoFAS.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
C213BC712BAC5771000794C9 /* Sync.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
C213BC722BAC5771000794C9 /* Sync.xcdatamodel */,
);
currentVersion = C213BC722BAC5771000794C9 /* Sync.xcdatamodel */;
name = Sync.xcdatamodeld;
path = /Users/adocyn/Documents/Projects/2FAS/TwoFAS/Sync/Watch/Sync.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
C22CF3DD27413F0F004F6A03 /* LogStorage.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (

67
TwoFAS/TwoFAS.xcodeproj/xcshareddata/xcschemes/StorageWatch.xcscheme Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C213BC1A2BAC3C82000794C9"
BuildableName = "StorageWatch.framework"
BlueprintName = "StorageWatch"
ReferencedContainer = "container:TwoFAS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C213BC1A2BAC3C82000794C9"
BuildableName = "StorageWatch.framework"
BlueprintName = "StorageWatch"
ReferencedContainer = "container:TwoFAS.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

25
TwoFAS/TwoFASWatch Watch App/ContentView.swift
View File

@ -21,6 +21,7 @@ import SwiftUI
import SyncWatch
import ProtectionWatch
import CommonWatch
import StorageWatch
struct ContentView: View {
@State var syncStstus = "Hello, world!"
@ -34,12 +35,32 @@ struct ContentView: View {
.padding()
.task {
let protection = Protection()
EncryptionHolder.initialize(with: protection.localKeyEncryption)
SyncInstanceWatch.initialize()
let storage = Storage(readOnly: false) { error in
// TODO: Add an alert here!
}
let serviceMigration = ServiceMigrationController(storageRepository: storage.storageRepository)
serviceMigration.serviceNameTranslation = "Service"//T.Commons.service
SyncInstanceWatch.initialize(commonSectionHandler: storage.section, commonServiceHandler: storage.service) { _ in
// TODO: Add an alert here!
}
SyncInstanceWatch.migrateStoreIfNeeded()
serviceMigration.migrateIfNeeded()
let handler = SyncInstanceWatch.getCloudHandler()
handler.registerForStateChange({ state in
print(">>> \(state)")
if state == .disabledAvailable {
handler.enable()
handler.synchronize()
}
syncStstus = "\(state)"
if state == .enabled(sync: .synced) {
print(">>>! \(storage.storageRepository.countServicesNotTrashed())")
}
}, with: "listener!")
handler.enable()
handler.synchronize()