oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Make everything build again

Browse source
This commit is contained in:
nielsandriesse 2020-11-11 17:45:50 +11:00
parent ffa64e4747
commit 7e213c71d5
178 changed files with 860 additions and 794 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LokiPushNotificationService/NotificationServiceExtension.swift
View file

@ -1,6 +1,5 @@
import UserNotifications
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
final class NotificationServiceExtension : UNNotificationServiceExtension {
static let isFromRemoteKey = "remote"
@ -184,7 +183,7 @@ final class NotificationServiceExtension : UNNotificationServiceExtension {
AppSetup.setupEnvironment(
appSpecificSingletonBlock: {
SSKEnvironment.shared.callMessageHandler = NoopCallMessageHandler()
SSKEnvironment.shared.notificationsManager = NoopNotificationsManager()
// SSKEnvironment.shared.notificationsManager = NoopNotificationsManager()
},
migrationCompletion: { [weak self] in
self?.versionMigrationsDidComplete()

3
LokiPushNotificationService/NotificationServiceExtensionContext.swift
View file

@ -3,8 +3,7 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
final class NotificationServiceExtensionContext : NSObject, AppContext {
let appLaunchTime = Date()

29
Podfile
View file

@ -60,32 +60,23 @@ target 'Signal' do
end
target 'SignalShareExtension' do
project 'Signal'
shared_pods
end
target 'LokiPushNotificationService' do
project 'Signal'
shared_pods
###
# Loki third party pods
###
pod 'CryptoSwift', '~> 1.3', :inhibit_warnings => true
end
target 'SignalMessaging' do
pod 'AFNetworking', inhibit_warnings: true
pod 'CocoaLumberjack', :inhibit_warnings => true
pod 'CryptoSwift', :inhibit_warnings => true
pod 'Curve25519Kit', :inhibit_warnings => true
pod 'libPhoneNumber-iOS', :inhibit_warnings => true
pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
pod 'PromiseKit', :inhibit_warnings => true
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
pod 'YYImage', git: 'https://github.com/signalapp/YYImage', :inhibit_warnings => true
end
target 'LokiPushNotificationService' do
pod 'AFNetworking', inhibit_warnings: true
pod 'CryptoSwift', :inhibit_warnings => true
pod 'Curve25519Kit', :inhibit_warnings => true
pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
pod 'PromiseKit', :inhibit_warnings => true
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
end
target 'SignalUtilitiesKit' do

2
Podfile.lock
View file

@ -218,6 +218,6 @@ SPEC CHECKSUMS:
YYImage: 6db68da66f20d9f169ceb94dfb9947c3867b9665
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: 678f8b89a861f2a5ff55ee1a2acf0b70e42eff8f
PODFILE CHECKSUM: 7f78e18fa317b1aa375f0a3c80ecf62fd8d30cca
COCOAPODS: 1.10.0.rc.1

2
Pods

@ -1 +1 @@
Subproject commit 0e8cae4ccaa2bb1fe672b771696b988fd1007fbe
Subproject commit f645dc823c2c4d70b18c5b07a940daa9d9c4a924

6
SessionSnodeKit/SnodeAPI.swift
View file

@ -123,14 +123,14 @@ public final class SnodeAPI : NSObject {
}
}
public static func clearSnodePool() {
// MARK: Public API
@objc public static func clearSnodePool() {
snodePool.removeAll()
Configuration.shared.storage.with { transaction in
Configuration.shared.storage.setSnodePool(to: [], using: transaction)
}
}
// MARK: Public API
public static func dropSnodeFromSwarmIfNeeded(_ snode: Snode, publicKey: String) {
let swarm = SnodeAPI.swarmCache[publicKey]
if var swarm = swarm, let index = swarm.firstIndex(of: snode) {

2
SessionUIKit/Style Guide/Notification+AppMode.swift
View file

@ -6,5 +6,5 @@ public extension Notification.Name {
@objc public extension NSNotification {
@objc public static let appModeChanged = Notification.Name.appModeChanged.rawValue as NSString
@objc static let appModeChanged = Notification.Name.appModeChanged.rawValue as NSString
}

18
Signal.xcodeproj/project.pbxproj
View file

@ -611,7 +611,7 @@
C33FDD14255A582000E217F9 /* OWSUDManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB5A255A580E00E217F9 /* OWSUDManager.swift */; };
C33FDD15255A582000E217F9 /* YapDatabaseTransaction+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB5B255A580E00E217F9 /* YapDatabaseTransaction+OWS.m */; };
C33FDD16255A582000E217F9 /* NSArray+Functional.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB5C255A580E00E217F9 /* NSArray+Functional.h */; settings = {ATTRIBUTES = (Public, ); }; };
C33FDD17255A582000E217F9 /* TSErrorMessage_privateConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB5D255A580E00E217F9 /* TSErrorMessage_privateConstructor.h */; };
C33FDD17255A582000E217F9 /* TSErrorMessage_privateConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB5D255A580E00E217F9 /* TSErrorMessage_privateConstructor.h */; settings = {ATTRIBUTES = (Public, ); }; };
C33FDD18255A582000E217F9 /* ContactParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB5E255A580E00E217F9 /* ContactParser.swift */; };
C33FDD19255A582000E217F9 /* YapDatabaseConnection+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB5F255A580E00E217F9 /* YapDatabaseConnection+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
C33FDD1A255A582000E217F9 /* TSMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB60255A580E00E217F9 /* TSMessage.m */; };
@ -833,6 +833,11 @@
C37F53A7255B96E0002AEA92 /* OWSAudioPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF2F5255B6DBC007E1867 /* OWSAudioPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
C37F53E9255BA9CE002AEA92 /* Environment.h in Headers */ = {isa = PBXBuildFile; fileRef = C37F53E8255BA9BB002AEA92 /* Environment.h */; settings = {ATTRIBUTES = (Public, ); }; };
C37F5403255BA9ED002AEA92 /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = C37F5402255BA9ED002AEA92 /* Environment.m */; };
C37F5414255BAFA7002AEA92 /* SignalUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C33FD9AB255A548A00E217F9 /* SignalUtilitiesKit.framework */; };
C37F54B9255BB2D4002AEA92 /* SessionProtocolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A8622553B41A00C340D1 /* SessionProtocolKit.framework */; };
C37F54BA255BB2D8002AEA92 /* SessionProtocolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A8622553B41A00C340D1 /* SessionProtocolKit.framework */; };
C37F54CB255BB53F002AEA92 /* SessionProtocolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A8622553B41A00C340D1 /* SessionProtocolKit.framework */; };
C37F54DC255BB84A002AEA92 /* SessionSnodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A59F255385C100C340D1 /* SessionSnodeKit.framework */; };
C38EEF0A255B49A8007E1867 /* SSKProtoEnvelope+Conversion.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EEF09255B49A8007E1867 /* SSKProtoEnvelope+Conversion.swift */; };
C38EEFD6255B5BA2007E1867 /* OldSnodeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EEFD5255B5BA2007E1867 /* OldSnodeAPI.swift */; };
C38EF00C255B61CC007E1867 /* SignalUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C33FD9AB255A548A00E217F9 /* SignalUtilitiesKit.framework */; };
@ -846,7 +851,7 @@
C38EF22A255B6D5D007E1867 /* AttachmentSharing.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF225255B6D5D007E1867 /* AttachmentSharing.h */; settings = {ATTRIBUTES = (Public, ); }; };
C38EF22B255B6D5D007E1867 /* ShareViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF226255B6D5D007E1867 /* ShareViewDelegate.swift */; };
C38EF22C255B6D5D007E1867 /* OWSVideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF227255B6D5D007E1867 /* OWSVideoPlayer.swift */; };
C38EF243255B6D67007E1867 /* UIViewController+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF236255B6D65007E1867 /* UIViewController+OWS.h */; };
C38EF243255B6D67007E1867 /* UIViewController+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF236255B6D65007E1867 /* UIViewController+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
C38EF244255B6D67007E1867 /* UIDevice+featureSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */; };
C38EF245255B6D67007E1867 /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF238255B6D66007E1867 /* UIFont+OWS.m */; };
C38EF246255B6D67007E1867 /* UIFont+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF239255B6D66007E1867 /* UIFont+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -2688,6 +2693,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C37F54B9255BB2D4002AEA92 /* SessionProtocolKit.framework in Frameworks */,
C38EF00E255B61DC007E1867 /* SignalUtilitiesKit.framework in Frameworks */,
C3402FE52559036600EA6424 /* SessionUIKit.framework in Frameworks */,
2AE2882E4C2B96BFFF9EE27C /* Pods_SignalShareExtension.framework in Frameworks */,
@ -2698,6 +2704,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C37F54BA255BB2D8002AEA92 /* SessionProtocolKit.framework in Frameworks */,
C38EF00C255B61CC007E1867 /* SignalUtilitiesKit.framework in Frameworks */,
390650A6D345BFE01E006DB0 /* Pods_LokiPushNotificationService.framework in Frameworks */,
);
@ -2764,6 +2771,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C37F54DC255BB84A002AEA92 /* SessionSnodeKit.framework in Frameworks */,
C37F54CB255BB53F002AEA92 /* SessionProtocolKit.framework in Frameworks */,
C37F5414255BAFA7002AEA92 /* SignalUtilitiesKit.framework in Frameworks */,
4CC1ECF9211A47CE00CC13BE /* StoreKit.framework in Frameworks */,
455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */,
455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */,
@ -5896,11 +5906,11 @@
"${BUILT_PRODUCTS_DIR}/YapDatabase/YapDatabase.framework",
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/libPhoneNumber-iOS/libPhoneNumber_iOS.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
@ -5921,11 +5931,11 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YapDatabase.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libPhoneNumber_iOS.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;

67
Signal.xcodeproj/xcshareddata/xcschemes/SignalUtilitiesKit.xcscheme Normal file
View file

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C33FD9AA255A548A00E217F9"
BuildableName = "SignalUtilitiesKit.framework"
BlueprintName = "SignalUtilitiesKit"
ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</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 = "App Store Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C33FD9AA255A548A00E217F9"
BuildableName = "SignalUtilitiesKit.framework"
BlueprintName = "SignalUtilitiesKit"
ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "App Store Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

14
Signal/Signal-Prefix.pch
View file

@ -15,12 +15,12 @@
static const NSUInteger ddLogLevel = DDLogLevelInfo;
#endif
#import <SessionCoreKit/NSObject+OWS.h>
#import <SessionCoreKit/OWSAsserts.h>
#import <SessionServiceKit/SSKAsserts.h>
#import <SessionServiceKit/OWSAnalytics.h>
#import <SessionServiceKit/NSArray+Functional.h>
#import <SessionServiceKit/NSSet+Functional.h>
#import <SessionServiceKit/NSObject+Casting.h>
#import <SessionProtocolKit/NSObject+OWS.h>
#import <SessionProtocolKit/OWSAsserts.h>
#import <SignalUtilitiesKit/SSKAsserts.h>
#import <SignalUtilitiesKit/OWSAnalytics.h>
#import <SignalUtilitiesKit/NSArray+Functional.h>
#import <SignalUtilitiesKit/NSSet+Functional.h>
#import <SignalUtilitiesKit/NSObject+Casting.h>
#import <SessionUIKit/SessionUIKit.h>
#endif

57
Signal/src/AppDelegate.m
View file

@ -14,34 +14,33 @@
#import "SignalsNavigationController.h"
#import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/iOSVersions.h>
#import <SignalMessaging/AppSetup.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging.h>
#import <SignalMessaging/VersionMigrations.h>
#import <SessionServiceKit/AppReadiness.h>
#import <SessionServiceKit/NSUserDefaults+OWS.h>
#import <SessionServiceKit/OWS2FAManager.h>
#import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SessionServiceKit/OWSDisappearingMessagesJob.h>
#import <SessionServiceKit/OWSFailedAttachmentDownloadsJob.h>
#import <SessionServiceKit/OWSFailedMessagesJob.h>
#import <SessionServiceKit/OWSIncompleteCallsJob.h>
#import <SessionServiceKit/OWSMath.h>
#import <SessionServiceKit/OWSMessageManager.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/OWSPrimaryStorage+Calling.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSPreKeyManager.h>
#import <SessionServiceKit/TSSocketManager.h>
#import <SessionProtocolKit/iOSVersions.h>
#import <SignalUtilitiesKit/AppSetup.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSNavigationController.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/OWSProfileManager.h>
#import <SignalUtilitiesKit/VersionMigrations.h>
#import <SignalUtilitiesKit/AppReadiness.h>
#import <SignalUtilitiesKit/NSUserDefaults+OWS.h>
#import <SignalUtilitiesKit/OWS2FAManager.h>
#import <SignalUtilitiesKit/OWSBatchMessageProcessor.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesJob.h>
#import <SignalUtilitiesKit/OWSFailedAttachmentDownloadsJob.h>
#import <SignalUtilitiesKit/OWSFailedMessagesJob.h>
#import <SignalUtilitiesKit/OWSIncompleteCallsJob.h>
#import <SignalUtilitiesKit/OWSMath.h>
#import <SignalUtilitiesKit/OWSMessageManager.h>
#import <SignalUtilitiesKit/OWSMessageSender.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+Calling.h>
#import <SignalUtilitiesKit/OWSReadReceiptManager.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSDatabaseView.h>
#import <SignalUtilitiesKit/TSPreKeyManager.h>
#import <SignalUtilitiesKit/TSSocketManager.h>
#import <YapDatabase/YapDatabaseCryptoUtils.h>
#import <sys/utsname.h>
@ -954,7 +953,7 @@ static NSTimeInterval launchStartedAt;
[ThreadUtil deleteAllContent];
[SSKEnvironment.shared.messageSenderJobQueue clearAllJobs];
[SSKEnvironment.shared.identityManager clearIdentityKey];
[LKSnodeAPI clearSnodePool];
[SNSnodeAPI clearSnodePool];
[self stopPoller];
[self stopClosedGroupPoller];
[self stopOpenGroupPollers];

4
Signal/src/Jobs/MessageFetcherJob.swift
View file

@ -4,7 +4,7 @@
import Foundation
import PromiseKit
import SessionServiceKit
import SignalUtilitiesKit
@objc(OWSMessageFetcherJob)
public class MessageFetcherJob: NSObject {
@ -160,7 +160,7 @@ public class MessageFetcherJob: NSObject {
private func fetchUndeliveredMessages() -> Promise<Set<Promise<[SSKProtoEnvelope]>>> {
let userPublickKey = getUserHexEncodedPublicKey() // Can be missing in rare cases
guard !userPublickKey.isEmpty else { return Promise.value(Set()) }
return SnodeAPI.getMessages(for: userPublickKey)
return Promise.value(Set())
}
private func acknowledgeDelivery(envelope: SSKProtoEnvelope) {

2
Signal/src/Jobs/OWSSessionResetJobRecord.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SessionServiceKit/SSKJobRecord.h>
#import <SignalUtilitiesKit/SSKJobRecord.h>
@class TSContactThread;

2
Signal/src/Jobs/OWSSessionResetJobRecord.m
View file

@ -3,7 +3,7 @@
//
#import "OWSSessionResetJobRecord.h"
#import <SessionServiceKit/TSContactThread.h>
#import <SignalUtilitiesKit/TSContactThread.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/Jobs/SessionResetJob.swift
View file

@ -4,7 +4,7 @@
import Foundation
import PromiseKit
import SessionServiceKit
import SignalUtilitiesKit
@objc(OWSSessionResetJobQueue)
public class SessionResetJobQueue: NSObject, JobQueue {

2
Signal/src/Jobs/SyncPushTokensJob.swift
View file

@ -3,7 +3,7 @@
//
import PromiseKit
import SessionServiceKit
import SignalUtilitiesKit
@objc(OWSSyncPushTokensJob)
class SyncPushTokensJob: NSObject {

2
Signal/src/Loki/Components/MentionCandidateSelectionView.swift
View file

@ -164,7 +164,7 @@ private extension MentionCandidateSelectionView {
profilePictureView.hexEncodedPublicKey = mentionCandidate.publicKey
profilePictureView.update()
if let server = publicChatServer, let channel = publicChatChannel {
let isUserModerator = PublicChatAPI.isUserModerator(mentionCandidate.publicKey, for: channel, on: server)
let isUserModerator = OpenGroupAPI.isUserModerator(mentionCandidate.publicKey, for: channel, on: server)
moderatorIconImageView.isHidden = !isUserModerator
} else {
moderatorIconImageView.isHidden = true

2
Signal/src/Loki/Utilities/BackgroundPoller.swift
View file

@ -12,7 +12,7 @@ public final class BackgroundPoller : NSObject {
promises.append(AppEnvironment.shared.messageFetcherJob.run()) // FIXME: It'd be nicer to just use Poller directly
closedGroupPoller = ClosedGroupPoller()
promises.append(contentsOf: closedGroupPoller.pollOnce())
var openGroups: [String:PublicChat] = [:]
var openGroups: [String:OpenGroup] = [:]
Storage.read { transaction in
openGroups = LokiDatabaseUtilities.getAllPublicChats(in: transaction)
}

2
Signal/src/Loki/Utilities/KeyPairUtilities.swift
View file

@ -8,7 +8,7 @@ enum KeyPairUtilities {
let ed25519KeyPair = Sodium().sign.keyPair(seed: (seed + padding).bytes)!
let x25519PublicKey = Sodium().sign.toX25519(ed25519PublicKey: ed25519KeyPair.publicKey)!
let x25519SecretKey = Sodium().sign.toX25519(ed25519SecretKey: ed25519KeyPair.secretKey)!
let x25519KeyPair = ECKeyPair(publicKey: Data(x25519PublicKey), privateKey: Data(x25519SecretKey))!
let x25519KeyPair = ECKeyPair(publicKey: Data(x25519PublicKey), privateKey: Data(x25519SecretKey))
return (ed25519KeyPair: ed25519KeyPair, x25519KeyPair: x25519KeyPair)
}

2
Signal/src/Loki/Utilities/MentionUtilities.swift
View file

@ -10,7 +10,7 @@ public final class MentionUtilities : NSObject {
@objc public static func highlightMentions(in string: String, isOutgoingMessage: Bool, threadID: String, attributes: [NSAttributedString.Key:Any]) -> NSAttributedString {
let userPublicKey = getUserHexEncodedPublicKey()
var publicChat: PublicChat?
var publicChat: OpenGroup?
OWSPrimaryStorage.shared().dbReadConnection.read { transaction in
publicChat = LokiDatabaseUtilities.getPublicChat(for: threadID, in: transaction)
MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadID, in: transaction)

8
Signal/src/Loki/View Controllers/HomeVC.swift
View file

@ -376,7 +376,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
guard let thread = self.thread(at: indexPath.row) else { return [] }
var publicChat: PublicChat?
var publicChat: OpenGroup?
OWSPrimaryStorage.shared().dbReadConnection.read { transaction in
publicChat = LokiDatabaseUtilities.getPublicChat(for: thread.uniqueId!, in: transaction)
}
@ -390,9 +390,9 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
messageIDs.insert(interaction.uniqueId!)
}
OWSPrimaryStorage.shared().updateMessageIDCollectionByPruningMessagesWithIDs(messageIDs, in: transaction)
transaction.removeObject(forKey: "\(publicChat.server).\(publicChat.channel)", inCollection: PublicChatAPI.lastMessageServerIDCollection)
transaction.removeObject(forKey: "\(publicChat.server).\(publicChat.channel)", inCollection: PublicChatAPI.lastDeletionServerIDCollection)
let _ = PublicChatAPI.leave(publicChat.channel, on: publicChat.server)
transaction.removeObject(forKey: "\(publicChat.server).\(publicChat.channel)", inCollection: Storage.lastMessageServerIDCollection)
transaction.removeObject(forKey: "\(publicChat.server).\(publicChat.channel)", inCollection: Storage.lastDeletionServerIDCollection)
let _ = OpenGroupAPI.leave(publicChat.channel, on: publicChat.server)
thread.removeAllThreadInteractions(with: transaction)
thread.remove(with: transaction)
} else if let thread = thread as? TSGroupThread, thread.usesSharedSenderKeys == true {

10
Signal/src/Loki/View Controllers/JoinPublicChatVC.swift
View file

@ -139,15 +139,15 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
let profilePictureURL = profileManager.profilePictureURL()
let profileKey = profileManager.localProfileKey().keyData
Storage.writeSync { transaction in
transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: PublicChatAPI.lastMessageServerIDCollection)
transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: PublicChatAPI.lastDeletionServerIDCollection)
transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: Storage.lastMessageServerIDCollection)
transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: Storage.lastDeletionServerIDCollection)
}
ModalActivityIndicatorViewController.present(fromViewController: navigationController!, canCancel: false) { [weak self] _ in
PublicChatManager.shared.addChat(server: urlAsString, channel: channelID)
.done(on: DispatchQueue.main) { [weak self] _ in
let _ = PublicChatAPI.setDisplayName(to: displayName, on: urlAsString)
let _ = PublicChatAPI.setProfilePictureURL(to: profilePictureURL, using: profileKey, on: urlAsString)
let _ = PublicChatAPI.join(channelID, on: urlAsString)
let _ = OpenGroupAPI.setDisplayName(to: displayName, on: urlAsString)
let _ = OpenGroupAPI.setProfilePictureURL(to: profilePictureURL, using: profileKey, on: urlAsString)
let _ = OpenGroupAPI.join(channelID, on: urlAsString)
let syncManager = SSKEnvironment.shared.syncManager
let _ = syncManager.syncAllOpenGroups()
self?.presentingViewController!.dismiss(animated: true, completion: nil)

2
Signal/src/Loki/View Controllers/LandingVC.swift
View file

@ -133,7 +133,7 @@ final class LandingVC : BaseVC, LinkDeviceVCDelegate, DeviceLinkingModalDelegate
return present(alert, animated: true, completion: nil)
}
let seed = Randomness.generateRandomBytes(16)!
let keyPair = Curve25519.generateKeyPair(fromSeed: seed + seed)
let keyPair = Curve25519.generateKeyPair()!
let identityManager = OWSIdentityManager.shared()
let databaseConnection = identityManager.value(forKey: "dbConnection") as! YapDatabaseConnection
databaseConnection.setObject(seed.toHexString(), forKey: "LKLokiSeed", inCollection: OWSPrimaryStorageIdentityKeyStoreCollection)

6
Signal/src/Loki/View Controllers/OpenGroupSuggestionSheet.swift
View file

@ -63,9 +63,9 @@ final class OpenGroupSuggestionSheet : Sheet {
let displayName = OWSProfileManager.shared().localProfileName()
// TODO: Profile picture & profile key
let _ = PublicChatManager.shared.addChat(server: url, channel: channelID).done(on: .main) { _ in
let _ = PublicChatAPI.getMessages(for: channelID, on: url)
let _ = PublicChatAPI.setDisplayName(to: displayName, on: url)
let _ = PublicChatAPI.join(channelID, on: url)
let _ = OpenGroupAPI.getMessages(for: channelID, on: url)
let _ = OpenGroupAPI.setDisplayName(to: displayName, on: url)
let _ = OpenGroupAPI.join(channelID, on: url)
}
close()
}

2
Signal/src/Loki/View Controllers/SettingsVC.swift
View file

@ -302,7 +302,7 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
DispatchQueue.main.async {
modalActivityIndicator.dismiss {
var isMaxFileSizeExceeded = false
if let error = error as? DotNetAPI.DotNetAPIError {
if let error = error as? DotNetAPI.Error {
isMaxFileSizeExceeded = (error == .maxFileSizeExceeded)
}
let title = isMaxFileSizeExceeded ? "Maximum File Size Exceeded" : "Couldn't Update Profile"

2
Signal/src/Models/AccountManager.swift
View file

@ -4,7 +4,7 @@
import Foundation
import PromiseKit
import SessionServiceKit
import SignalUtilitiesKit
/**
* Signal is actually two services - textSecure for messages and red phone (for calls).

2
Signal/src/Models/CompareSafetyNumbersActivity.swift
View file

@ -3,7 +3,7 @@
//
import Foundation
import SessionServiceKit
import SignalUtilitiesKit
let CompareSafetyNumbersActivityType = "org.whispersystems.signal.activity.CompareSafetyNumbers"

4
Signal/src/Models/OWSDeviceProvisioningURLParser.m
View file

@ -3,8 +3,8 @@
//
#import "OWSDeviceProvisioningURLParser.h"
#import <SessionAxolotlKit/NSData+keyVersionByte.h>
#import <SessionCoreKit/NSData+OWS.h>
#import <SessionProtocolKit/NSData+keyVersionByte.h>
#import <SessionProtocolKit/NSData+OWS.h>
NS_ASSUME_NONNULL_BEGIN

152
Signal/src/Signal-Bridging-Header.h
View file

@ -44,84 +44,84 @@
#import "SignalApp.h"
#import "UIViewController+Permissions.h"
#import "ViewControllerUtils.h"
#import <SessionAxolotlKit/NSData+keyVersionByte.h>
#import <SessionProtocolKit/NSData+keyVersionByte.h>
#import <PureLayout/PureLayout.h>
#import <Reachability/Reachability.h>
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/NSData+OWS.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/OWSAsserts.h>
#import <SessionCoreKit/OWSLogs.h>
#import <SessionCoreKit/Threading.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSAudioPlayer.h>
#import <SignalMessaging/OWSContactAvatarBuilder.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/OWSQuotedReplyModel.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalMessaging/OWSViewController.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SessionServiceKit/AppVersion.h>
#import <SessionServiceKit/Contact.h>
#import <SessionServiceKit/ContactsUpdater.h>
#import <SessionServiceKit/DataSource.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SessionServiceKit/NSData+Image.h>
#import <SessionServiceKit/NSNotificationCenter+OWS.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionServiceKit/OWSAnalytics.h>
#import <SessionServiceKit/OWSAnalyticsEvents.h>
#import <SessionServiceKit/OWSBackgroundTask.h>
#import <SessionServiceKit/OWSCallMessageHandler.h>
#import <SessionServiceKit/OWSContactsOutputStream.h>
#import <SessionServiceKit/OWSDispatch.h>
#import <SessionServiceKit/OWSEndSessionMessage.h>
#import <SessionServiceKit/LKDeviceLinkMessage.h>
#import <SessionServiceKit/OWSError.h>
#import <SessionServiceKit/OWSFileSystem.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSMediaGalleryFinder.h>
#import <SessionServiceKit/OWSMessageManager.h>
#import <SessionServiceKit/OWSMessageReceiver.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/OWSOutgoingCallMessage.h>
#import <SessionServiceKit/OWSPrimaryStorage+Calling.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/OWSProfileKeyMessage.h>
#import <SessionServiceKit/OWSRecipientIdentity.h>
#import <SessionServiceKit/OWSRequestFactory.h>
#import <SessionServiceKit/OWSSignalService.h>
#import <SessionServiceKit/PhoneNumber.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SessionServiceKit/SignalRecipient.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSAttachment.h>
#import <SessionServiceKit/TSAttachmentPointer.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SessionServiceKit/TSCall.h>
#import <SessionServiceKit/TSContactThread.h>
#import <SessionServiceKit/TSErrorMessage.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSIncomingMessage.h>
#import <SessionServiceKit/TSInfoMessage.h>
#import <SessionServiceKit/TSNetworkManager.h>
#import <SessionServiceKit/TSOutgoingMessage.h>
#import <SessionServiceKit/TSPreKeyManager.h>
#import <SessionServiceKit/TSSocketManager.h>
#import <SessionServiceKit/TSThread.h>
#import <SessionServiceKit/LKGroupUtilities.h>
#import <SessionServiceKit/UIImage+OWS.h>
#import <SessionProtocolKit/Cryptography.h>
#import <SessionProtocolKit/NSData+OWS.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SessionProtocolKit/OWSAsserts.h>
#import <SessionProtocolKit/OWSLogs.h>
#import <SessionProtocolKit/Threading.h>
#import <SignalUtilitiesKit/AttachmentSharing.h>
#import <SignalUtilitiesKit/ContactTableViewCell.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSAudioPlayer.h>
#import <SignalUtilitiesKit/OWSContactAvatarBuilder.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/OWSProfileManager.h>
#import <SignalUtilitiesKit/OWSQuotedReplyModel.h>
#import <SignalUtilitiesKit/OWSSounds.h>
#import <SignalUtilitiesKit/OWSViewController.h>
#import <SignalUtilitiesKit/ThreadUtil.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/UIViewController+OWS.h>
#import <SignalUtilitiesKit/AppVersion.h>
#import <SignalUtilitiesKit/Contact.h>
#import <SignalUtilitiesKit/ContactsUpdater.h>
#import <SignalUtilitiesKit/DataSource.h>
#import <SignalUtilitiesKit/MIMETypeUtil.h>
#import <SignalUtilitiesKit/NSData+Image.h>
#import <SignalUtilitiesKit/NSNotificationCenter+OWS.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
#import <SignalUtilitiesKit/OWSAnalytics.h>
#import <SignalUtilitiesKit/OWSAnalyticsEvents.h>
#import <SignalUtilitiesKit/OWSBackgroundTask.h>
#import <SignalUtilitiesKit/OWSCallMessageHandler.h>
#import <SignalUtilitiesKit/OWSContactsOutputStream.h>
#import <SignalUtilitiesKit/OWSDispatch.h>
#import <SignalUtilitiesKit/OWSEndSessionMessage.h>
#import <SignalUtilitiesKit/LKDeviceLinkMessage.h>
#import <SignalUtilitiesKit/OWSError.h>
#import <SignalUtilitiesKit/OWSFileSystem.h>
#import <SignalUtilitiesKit/OWSIdentityManager.h>
#import <SignalUtilitiesKit/OWSMediaGalleryFinder.h>
#import <SignalUtilitiesKit/OWSMessageManager.h>
#import <SignalUtilitiesKit/OWSMessageReceiver.h>
#import <SignalUtilitiesKit/OWSMessageSender.h>
#import <SignalUtilitiesKit/OWSOutgoingCallMessage.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+Calling.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/OWSProfileKeyMessage.h>
#import <SignalUtilitiesKit/OWSRecipientIdentity.h>
#import <SignalUtilitiesKit/OWSRequestFactory.h>
#import <SignalUtilitiesKit/OWSSignalService.h>
#import <SignalUtilitiesKit/PhoneNumber.h>
#import <SignalUtilitiesKit/SignalAccount.h>
#import <SignalUtilitiesKit/SignalRecipient.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSAttachment.h>
#import <SignalUtilitiesKit/TSAttachmentPointer.h>
#import <SignalUtilitiesKit/TSAttachmentStream.h>
#import <SignalUtilitiesKit/TSCall.h>
#import <SignalUtilitiesKit/TSContactThread.h>
#import <SignalUtilitiesKit/TSErrorMessage.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
#import <SignalUtilitiesKit/TSIncomingMessage.h>
#import <SignalUtilitiesKit/TSInfoMessage.h>
#import <SignalUtilitiesKit/TSNetworkManager.h>
#import <SignalUtilitiesKit/TSOutgoingMessage.h>
#import <SignalUtilitiesKit/TSPreKeyManager.h>
#import <SignalUtilitiesKit/TSSocketManager.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/LKGroupUtilities.h>
#import <SignalUtilitiesKit/UIImage+OWS.h>
#import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCCameraPreviewView.h>
#import <YYImage/YYImage.h>

10
Signal/src/ViewControllers/AppSettings/AboutTableViewController.m
View file

@ -5,11 +5,11 @@
#import "AboutTableViewController.h"
#import "Session-Swift.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/UIUtil.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/TSDatabaseView.h>
@implementation AboutTableViewController

4
Signal/src/ViewControllers/AppSettings/AddToBlockListViewController.m
View file

@ -5,8 +5,8 @@
#import "AddToBlockListViewController.h"
#import "BlockListUIUtils.h"
#import "ContactsViewHelper.h"
#import <SignalMessaging/OWSContactsManager.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/SignalAccount.h>
NS_ASSUME_NONNULL_BEGIN

6
Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m
View file

@ -11,9 +11,9 @@
#import "TSAccountManager.h"
#import <PromiseKit/AnyPromise.h>
#import <Reachability/Reachability.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SessionServiceKit/OWSSignalService.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/OWSSignalService.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/AppSettings/BlockListViewController.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSViewController.h>
#import <SignalUtilitiesKit/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/AppSettings/BlockListViewController.m
View file

@ -12,10 +12,10 @@
#import "Session-Swift.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SessionServiceKit/OWSBlockingManager.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSViewController.h>
#import <SignalUtilitiesKit/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
View file

@ -8,8 +8,8 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Theme.h>
#import <SessionServiceKit/OWSSignalService.h>
#import <SignalUtilitiesKit/Theme.h>
#import <SignalUtilitiesKit/OWSSignalService.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m
View file

@ -5,8 +5,8 @@
#import "NotificationSettingsOptionsViewController.h"
#import "Session-Swift.h"
#import "SignalApp.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
@implementation NotificationSettingsOptionsViewController

8
Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m
View file

@ -7,10 +7,10 @@
#import "NotificationSettingsViewController.h"
#import "NotificationSettingsOptionsViewController.h"
#import "OWSSoundSettingsViewController.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/OWSSounds.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import "Session-Swift.h"
@implementation NotificationSettingsViewController

2
Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSTableViewController.h>
#import <SignalUtilitiesKit/OWSTableViewController.h>
NS_ASSUME_NONNULL_BEGIN

14
Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m
View file

@ -7,13 +7,13 @@
#import "Session-Swift.h"
#import "ThreadUtil.h"
#import <PromiseKit/AnyPromise.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SignalUtilitiesKit/AttachmentSharing.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/MIMETypeUtil.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/AppSettings/OWSQRCodeScanningViewController.h
View file

@ -3,7 +3,7 @@
//
#import <AVFoundation/AVFoundation.h>
#import <SignalMessaging/OWSViewController.h>
#import <SignalUtilitiesKit/OWSViewController.h>
#import <UIKit/UIKit.h>
#import <ZXingObjC/ZXingObjC.h>

8
Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m
View file

@ -4,10 +4,10 @@
#import "OWSSoundSettingsViewController.h"
#import <AVFoundation/AVFoundation.h>
#import <SignalMessaging/OWSAudioPlayer.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalUtilitiesKit/OWSAudioPlayer.h>
#import <SignalUtilitiesKit/OWSSounds.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import "Session-Swift.h"
NS_ASSUME_NONNULL_BEGIN

18
Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m
View file

@ -5,15 +5,15 @@
#import "PrivacySettingsTableViewController.h"
#import "BlockListViewController.h"
#import "Session-Swift.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWS2FAManager.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/ThreadUtil.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/OWS2FAManager.h>
#import <SignalUtilitiesKit/OWSReadReceiptManager.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

14
Signal/src/ViewControllers/AvatarViewHelper.m
View file

@ -6,13 +6,13 @@
#import "OWSNavigationController.h"
#import "Session-Swift.h"
#import <MobileCoreServices/UTCoreTypes.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h>
#import <SessionServiceKit/PhoneNumber.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSThread.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/PhoneNumber.h>
#import <SignalUtilitiesKit/TSGroupModel.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/Call/CallViewController.swift
View file

@ -5,8 +5,8 @@
//import Foundation
//import WebRTC
//import PromiseKit
//import SessionServiceKit
//import SignalMessaging
//import SignalUtilitiesKit
//import SignalUtilitiesKit
//
//// TODO: Add category so that button handlers can be defined where button is created.
//// TODO: Ensure buttons enabled & disabled as necessary.

2
Signal/src/ViewControllers/ContactShareViewHelper.swift
View file

@ -3,7 +3,7 @@
//
import Foundation
import SessionServiceKit
import SignalUtilitiesKit
import ContactsUI
import MessageUI

4
Signal/src/ViewControllers/ContactViewController.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
import Reachability
import ContactsUI
import MessageUI

2
Signal/src/ViewControllers/ContactsPicker.swift
View file

@ -9,7 +9,7 @@
import UIKit
import Contacts
import SessionServiceKit
import SignalUtilitiesKit
@objc
public protocol ContactsPickerDelegate: class {

10
Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m
View file

@ -5,11 +5,11 @@
#import "AttachmentUploadView.h"
#import "OWSBezierPathView.h"
#import "OWSProgressView.h"
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SessionServiceKit/AppContext.h>
#import <SessionServiceKit/OWSUploadOperation.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/AppContext.h>
#import <SignalUtilitiesKit/OWSUploadOperation.h>
#import <SignalUtilitiesKit/TSAttachmentStream.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
View file

@ -4,7 +4,7 @@
#import "OWSBubbleShapeView.h"
#import "OWSBubbleView.h"
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
View file

@ -4,7 +4,7 @@
#import "OWSBubbleView.h"
#import "MainAppContext.h"
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import "Session-Swift.h"
NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
View file

@ -5,10 +5,10 @@
#import "OWSContactOffersCell.h"
#import "ConversationViewItem.h"
#import "Session-Swift.h"
#import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/OWSContactOffersInteraction.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m
View file

@ -7,10 +7,10 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SessionServiceKit/OWSContact.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/OWSContact.h>
NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
View file

@ -8,10 +8,10 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SessionServiceKit/OWSContact.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/OWSContact.h>
NS_ASSUME_NONNULL_BEGIN

10
Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
View file

@ -8,11 +8,11 @@
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import "ViewControllerUtils.h"
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SessionServiceKit/MimeTypeUtil.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/MimeTypeUtil.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/TSAttachmentStream.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
View file

@ -16,7 +16,7 @@
#import "OWSQuotedMessageView.h"
#import "Session-Swift.h"
#import "UIColor+OWS.h"
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
NS_ASSUME_NONNULL_BEGIN

6
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View file

@ -7,7 +7,7 @@
#import "OWSMessageBubbleView.h"
#import "OWSMessageHeaderView.h"
#import "Session-Swift.h"
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -287,12 +287,12 @@ NS_ASSUME_NONNULL_BEGIN
// Loki: Show the moderator icon if needed
if (self.viewItem.isGroupThread && !self.viewItem.isRSSFeed) { // FIXME: This logic also shouldn't apply to closed groups
__block LKPublicChat *publicChat;
__block SNOpenGroup *publicChat;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChat = [LKDatabaseUtilities getPublicChatForThreadID:self.viewItem.interaction.uniqueThreadId transaction: transaction];
}];
if (publicChat != nil) {
BOOL isModerator = [LKPublicChatAPI isUserModerator:incomingMessage.authorId forChannel:publicChat.channel onServer:publicChat.server];
BOOL isModerator = [SNOpenGroupAPI isUserModerator:incomingMessage.authorId forChannel:publicChat.channel onServer:publicChat.server];
UIImage *moderatorIcon = [UIImage imageNamed:@"Crown"];
self.moderatorIconImageView.image = moderatorIcon;
self.moderatorIconImageView.hidden = !isModerator;

8
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
View file

@ -5,10 +5,10 @@
#import "OWSMessageHeaderView.h"
#import "ConversationViewItem.h"
#import "Session-Swift.h"
#import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/OWSUnreadIndicator.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSTextView.h>
#import <SignalUtilitiesKit/OWSTextView.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.m
View file

@ -3,7 +3,7 @@
//
#import "OWSMessageTextView.h"
#import <SignalMessaging/UIView+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
View file

@ -8,8 +8,8 @@
#import "UIColor+OWS.h"
#import "UIView+OWS.h"
#import <QuartzCore/QuartzCore.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
NS_ASSUME_NONNULL_BEGIN

16
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
View file

@ -7,13 +7,13 @@
#import "Environment.h"
#import "OWSBubbleView.h"
#import "Session-Swift.h"
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SessionServiceKit/TSMessage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIColor+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/TSAttachmentStream.h>
#import <SignalUtilitiesKit/TSMessage.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -554,7 +554,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 4;
if (quotedAuthor == self.quotedMessage.authorId) {
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
LKPublicChat *publicChat = [LKDatabaseUtilities getPublicChatForThreadID:self.quotedMessage.threadId transaction:transaction];
SNOpenGroup *publicChat = [LKDatabaseUtilities getPublicChatForThreadID:self.quotedMessage.threadId transaction:transaction];
if (publicChat != nil) {
quotedAuthor = [LKUserDisplayNameUtilities getPublicChatDisplayNameFor:self.quotedMessage.authorId in:publicChat.channel on:publicChat.server using:transaction];
} else {

12
Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
View file

@ -9,12 +9,12 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/TSCall.h>
#import <SessionServiceKit/TSErrorMessage.h>
#import <SessionServiceKit/TSInfoMessage.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSVerificationStateChangeMessage.h>
#import <SignalUtilitiesKit/TSCall.h>
#import <SignalUtilitiesKit/TSErrorMessage.h>
#import <SignalUtilitiesKit/TSInfoMessage.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSTextView.h>
#import <SignalUtilitiesKit/OWSTextView.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
View file

@ -4,7 +4,7 @@
#import "ConversationInputTextView.h"
#import "Session-Swift.h"
#import <SessionServiceKit/NSString+SSK.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
NS_ASSUME_NONNULL_BEGIN

12
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View file

@ -12,11 +12,11 @@
#import "UIFont+OWS.h"
#import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionServiceKit/TSQuotedMessage.h>
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
#import <SignalUtilitiesKit/TSQuotedMessage.h>
NS_ASSUME_NONNULL_BEGIN
@ -1092,7 +1092,7 @@ const CGFloat kMaxTextViewHeight = 120;
- (void)showMentionCandidateSelectionViewFor:(NSArray<LKMention *> *)mentionCandidates in:(TSThread *)thread
{
__block LKPublicChat *publicChat;
__block SNOpenGroup *publicChat;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChat = [LKDatabaseUtilities getPublicChatForThreadID:thread.uniqueId transaction:transaction];
}];

2
Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
View file

@ -6,7 +6,7 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Theme.h>
#import <SignalUtilitiesKit/Theme.h>
#import "Session-Swift.h"
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/ConversationViewController.h
View file

@ -2,6 +2,8 @@
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalUtilitiesKit/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSUInteger, ConversationViewAction) {

91
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -4,7 +4,7 @@
#import "ConversationViewController.h"
#import "AppDelegate.h"
#import "BlockListUIUtils.h"
#import <SignalUtilitiesKit/BlockListUIUtils.h>
#import "BlockListViewController.h"
#import "ContactsViewHelper.h"
#import "ConversationCollectionView.h"
@ -18,7 +18,7 @@
#import "DateUtil.h"
#import "DebugUITableViewController.h"
#import "FingerprintViewController.h"
#import "NSAttributedString+OWS.h"
#import <SignalUtilitiesKit/NSAttributedString+OWS.h>
#import "OWSAudioPlayer.h"
#import "OWSContactOffersCell.h"
#import "OWSConversationSettingsViewController.h"
@ -28,16 +28,16 @@
#import "OWSMessageCell.h"
#import "OWSSystemMessageCell.h"
#import "Session-Swift.h"
#import "SignalKeyingStorage.h"
#import <SignalUtilitiesKit/SignalKeyingStorage.h>
#import "TSAttachmentPointer.h"
#import "TSCall.h"
#import <SignalUtilitiesKit/TSCall.h>
#import "TSContactThread.h"
#import "TSDatabaseView.h"
#import "TSErrorMessage.h"
#import "TSGroupThread.h"
#import "TSIncomingMessage.h"
#import "TSInfoMessage.h"
#import "TSInvalidIdentityKeyErrorMessage.h"
#import <SignalUtilitiesKit/TSInvalidIdentityKeyErrorMessage.h>
#import "UIFont+OWS.h"
#import "UIViewController+Permissions.h"
#import "ViewControllerUtils.h"
@ -46,48 +46,47 @@
#import <ContactsUI/CNContactViewController.h>
#import <MobileCoreServices/UTCoreTypes.h>
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Threading.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalMessaging/OWSUserProfile.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SessionServiceKit/Contact.h>
#import <SessionServiceKit/ContactsUpdater.h>
#import <SessionServiceKit/MimeTypeUtil.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionServiceKit/OWSAddToContactsOfferMessage.h>
#import <SessionServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SessionServiceKit/OWSAttachmentDownloads.h>
#import <SessionServiceKit/OWSBlockingManager.h>
#import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSMessageManager.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/OWSMessageUtils.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/OWSPrimaryStorage+Loki.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SessionServiceKit/TSNetworkManager.h>
#import <SessionServiceKit/TSQuotedMessage.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SessionProtocolKit/Threading.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSContactOffersInteraction.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/OWSNavigationController.h>
#import <SignalUtilitiesKit/OWSUnreadIndicator.h>
#import <SignalUtilitiesKit/OWSUserProfile.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/ThreadUtil.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/UIViewController+OWS.h>
#import <SignalUtilitiesKit/Contact.h>
#import <SignalUtilitiesKit/ContactsUpdater.h>
#import <SignalUtilitiesKit/MIMETypeUtil.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
#import <SignalUtilitiesKit/OWSAddToContactsOfferMessage.h>
#import <SignalUtilitiesKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SignalUtilitiesKit/OWSAttachmentDownloads.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalUtilitiesKit/OWSIdentityManager.h>
#import <SignalUtilitiesKit/OWSMessageManager.h>
#import <SignalUtilitiesKit/OWSMessageSender.h>
#import <SignalUtilitiesKit/OWSMessageUtils.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+Loki.h>
#import <SignalUtilitiesKit/OWSReadReceiptManager.h>
#import <SignalUtilitiesKit/OWSVerificationStateChangeMessage.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSGroupModel.h>
#import <SignalUtilitiesKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalUtilitiesKit/TSNetworkManager.h>
#import <SignalUtilitiesKit/TSQuotedMessage.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h>
#import <YapDatabase/YapDatabaseViewConnection.h>
#import <SessionMetadataKit/SessionMetadataKit-Swift.h>
@import Photos;
@ -680,11 +679,11 @@ typedef enum : NSUInteger {
if (self.thread.isGroupThread) {
TSGroupThread *thread = (TSGroupThread *)self.thread;
if (!thread.isPublicChat) { return; }
__block LKPublicChat *publicChat;
__block SNOpenGroup *publicChat;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChat = [LKDatabaseUtilities getPublicChatForThreadID:thread.uniqueId transaction:transaction];
}];
[LKPublicChatAPI getInfoForChannelWithID:publicChat.channel onServer:publicChat.server]
[SNOpenGroupAPI getInfoForChannelWithID:publicChat.channel onServer:publicChat.server]
.thenOn(dispatch_get_main_queue(), ^(id userCount) {
[self.headerView updateSubtitleForCurrentStatus];
});
@ -2041,7 +2040,7 @@ typedef enum : NSUInteger {
if ([conversationViewItem.interaction isKindOfClass:TSMessage.class]) {
messageID = ((TSMessage *)conversationViewItem.interaction).openGroupServerMessageID;
}
[LKPublicChatAPI reportMessageWithID:messageID inChannel:1 onServer:@"https://chat.getsession.org"];
[SNOpenGroupAPI reportMessageWithID:messageID inChannel:1 onServer:@"https://chat.getsession.org"];
}]];
[alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:nil]];
[self presentViewController:alert animated:YES completion:nil];

22
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
View file

@ -9,13 +9,13 @@
#import "OWSSystemMessageCell.h"
#import "Session-Swift.h"
#import "AnyPromise.h"
#import <SignalMessaging/OWSUnreadIndicator.h>
#import <SessionServiceKit/NSData+Image.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWSContact.h>
#import <SessionServiceKit/TSInteraction.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SignalUtilitiesKit/OWSUnreadIndicator.h>
#import <SignalUtilitiesKit/NSData+Image.h>
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/OWSContact.h>
#import <SignalUtilitiesKit/TSInteraction.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -1186,7 +1186,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
TSMessage *message = (TSMessage *)self.interaction;
if (!message.isOpenGroupMessage) return;
__block LKPublicChat *publicChat;
__block SNOpenGroup *publicChat;
[self.primaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChat = [LKDatabaseUtilities getPublicChatForThreadID:groupThread.uniqueId transaction: transaction];
}];
@ -1194,7 +1194,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
// Delete the message
BOOL isSentByUser = (interationType == OWSInteractionType_OutgoingMessage);
[[LKPublicChatAPI deleteMessageWithID:message.openGroupServerMessageID forGroup:publicChat.channel onServer:publicChat.server isSentByUser:isSentByUser].catch(^(NSError *error) {
[[SNOpenGroupAPI deleteMessageWithID:message.openGroupServerMessageID forGroup:publicChat.channel onServer:publicChat.server isSentByUser:isSentByUser].catch(^(NSError *error) {
// Roll back
[self.interaction save];
}) retainUntilComplete];
@ -1262,7 +1262,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
if (!message.isOpenGroupMessage) return true;
// Ensure we have the details needed to contact the server
__block LKPublicChat *publicChat;
__block SNOpenGroup *publicChat;
[self.primaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChat = [LKDatabaseUtilities getPublicChatForThreadID:groupThread.uniqueId transaction: transaction];
}];
@ -1270,7 +1270,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
if (interationType == OWSInteractionType_IncomingMessage) {
// Only allow deletion on incoming messages if the user has moderation permission
return [LKPublicChatAPI isUserModerator:self.userHexEncodedPublicKey forChannel:publicChat.channel onServer:publicChat.server];
return [SNOpenGroupAPI isUserModerator:self.userHexEncodedPublicKey forChannel:publicChat.channel onServer:publicChat.server];
} else {
// Only allow deletion on outgoing messages if the user was the sender (i.e. it was not sent from another linked device)
return [self.interaction.actualSenderHexEncodedPublicKey isEqual:self.userHexEncodedPublicKey];

30
Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
View file

@ -8,21 +8,21 @@
#import "OWSMessageBubbleView.h"
#import "OWSQuotedReplyModel.h"
#import "Session-Swift.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SessionServiceKit/OWSBlockingManager.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSIncomingMessage.h>
#import <SessionServiceKit/TSOutgoingMessage.h>
#import <SessionServiceKit/TSThread.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SignalUtilitiesKit/OWSContactOffersInteraction.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSUnreadIndicator.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/ThreadUtil.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <SignalUtilitiesKit/TSDatabaseView.h>
#import <SignalUtilitiesKit/TSIncomingMessage.h>
#import <SignalUtilitiesKit/TSOutgoingMessage.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
#import <SignalUtilitiesKit/TSGroupModel.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h>

2
Signal/src/ViewControllers/CropScaleImageViewController.swift
View file

@ -4,7 +4,7 @@
import Foundation
import MediaPlayer
import SignalMessaging
import SignalUtilitiesKit
// This kind of view is tricky. I've tried to organize things in the
// simplest possible way.

2
Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
View file

@ -5,7 +5,7 @@
#import "DebugContactsUtils.h"
#import "Session-Swift.h"
#import <Contacts/Contacts.h>
#import <SessionCoreKit/Randomness.h>
#import <Curve25519Kit/Randomness.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUIBackup.m
View file

@ -7,7 +7,7 @@
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/Randomness.h>
#import <Curve25519Kit/Randomness.h>
@import CloudKit;

4
Signal/src/ViewControllers/DebugUI/DebugUICalling.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
class DebugUICalling: DebugUIPage {

2
Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
View file

@ -8,7 +8,7 @@
#import "Session-Swift.h"
#import "SignalApp.h"
#import <Contacts/Contacts.h>
#import <SessionCoreKit/Randomness.h>
#import <Curve25519Kit/Randomness.h>
NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
View file

@ -6,10 +6,10 @@
#import "OWSOrphanDataCleaner.h"
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSInteraction.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/TSDatabaseView.h>
#import <SignalUtilitiesKit/TSInteraction.h>
NS_ASSUME_NONNULL_BEGIN

30
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View file

@ -9,21 +9,21 @@
#import "DebugUIMessagesAssetLoader.h"
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SessionServiceKit/OWSMessageUtils.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/OWSSyncGroupsRequestMessage.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/TSIncomingMessage.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SessionServiceKit/TSOutgoingMessage.h>
#import <SessionServiceKit/TSThread.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/MIMETypeUtil.h>
#import <SignalUtilitiesKit/OWSBatchMessageProcessor.h>
#import <SignalUtilitiesKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalUtilitiesKit/OWSMessageUtils.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/OWSSyncGroupsRequestMessage.h>
#import <SignalUtilitiesKit/OWSVerificationStateChangeMessage.h>
#import <SignalUtilitiesKit/TSIncomingMessage.h>
#import <SignalUtilitiesKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalUtilitiesKit/TSOutgoingMessage.h>
#import <SignalUtilitiesKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.m
View file

@ -3,7 +3,7 @@
//
#import "DebugUIMessagesAction.h"
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
NS_ASSUME_NONNULL_BEGIN

10
Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m
View file

@ -6,11 +6,11 @@
#import <AFNetworking/AFHTTPSessionManager.h>
#import <AFNetworking/AFNetworking.h>
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/Randomness.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SessionServiceKit/OWSFileSystem.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAttachment.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalUtilitiesKit/MIMETypeUtil.h>
#import <SignalUtilitiesKit/OWSFileSystem.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSAttachment.h>
NS_ASSUME_NONNULL_BEGIN

22
Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
View file

@ -9,17 +9,17 @@
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import "ThreadUtil.h"
#import <SessionAxolotlKit/PreKeyBundle.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/Environment.h>
#import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/TSCall.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SessionServiceKit/TSThread.h>
#import <SessionServiceKit/UIImage+OWS.h>
#import <SessionProtocolKit/PreKeyBundle.h>
#import <SignalUtilitiesKit/AttachmentSharing.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/OWSVerificationStateChangeMessage.h>
#import <SignalUtilitiesKit/TSCall.h>
#import <SignalUtilitiesKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/UIImage+OWS.h>
NS_ASSUME_NONNULL_BEGIN

97
Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
import PromiseKit
class DebugUINotifications: DebugUIPage {
@ -35,11 +35,11 @@ class DebugUINotifications: DebugUIPage {
var sectionItems: [OWSTableItem] = []
if let contactThread = thread as? TSContactThread {
sectionItems += [
OWSTableItem(title: "All Notifications in Sequence") { [weak self] in
self?.notifyForEverythingInSequence(contactThread: contactThread).retainUntilComplete()
},
// if let contactThread = thread as? TSContactThread {
// sectionItems += [
// OWSTableItem(title: "All Notifications in Sequence") { [weak self] in
// self?.notifyForEverythingInSequence(contactThread: contactThread).retainUntilComplete()
// },
// OWSTableItem(title: "Incoming Call") { [weak self] in
// self?.notifyForIncomingCall(thread: contactThread).retainUntilComplete()
// },
@ -52,22 +52,22 @@ class DebugUINotifications: DebugUIPage {
// OWSTableItem(title: "Call Rejected: No Longer Verified") { [weak self] in
// self?.notifyForMissedCallBecauseOfNoLongerVerifiedIdentity(thread: contactThread).retainUntilComplete()
// }
]
}
// ]
// }
sectionItems += [
OWSTableItem(title: "Last Incoming Message") { [weak self] in
self?.notifyForIncomingMessage(thread: thread).retainUntilComplete()
},
OWSTableItem(title: "Notify For Error Message") { [weak self] in
self?.notifyForErrorMessage(thread: thread).retainUntilComplete()
},
OWSTableItem(title: "Notify For Threadless Error Message") { [weak self] in
self?.notifyUserForThreadlessErrorMessage().retainUntilComplete()
}
]
// sectionItems += [
// OWSTableItem(title: "Last Incoming Message") { [weak self] in
// self?.notifyForIncomingMessage(thread: thread).retainUntilComplete()
// },
//
// OWSTableItem(title: "Notify For Error Message") { [weak self] in
// self?.notifyForErrorMessage(thread: thread).retainUntilComplete()
// },
//
// OWSTableItem(title: "Notify For Threadless Error Message") { [weak self] in
// self?.notifyUserForThreadlessErrorMessage().retainUntilComplete()
// }
// ]
return OWSTableSection(title: "Notifications have delay: \(kNotificationDelay)s", items: sectionItems)
}
@ -110,9 +110,8 @@ class DebugUINotifications: DebugUIPage {
// MARK: Notification Methods
func notifyForEverythingInSequence(contactThread: TSContactThread) -> Guarantee<Void> {
let taskIdentifier = UIApplication.shared.beginBackgroundTask(expirationHandler: nil)
// func notifyForEverythingInSequence(contactThread: TSContactThread) -> Guarantee<Void> {
// let taskIdentifier = UIApplication.shared.beginBackgroundTask(expirationHandler: nil)
// return firstly {
// self.notifyForIncomingCall(thread: contactThread)
// }.then {
@ -122,16 +121,16 @@ class DebugUINotifications: DebugUIPage {
// }.then {
// self.notifyForMissedCallBecauseOfNoLongerVerifiedIdentity(thread: contactThread)
// }.then
return firstly {
self.notifyForIncomingMessage(thread: contactThread)
}.then {
self.notifyForErrorMessage(thread: contactThread)
}.then {
self.notifyUserForThreadlessErrorMessage()
}.done {
UIApplication.shared.endBackgroundTask(taskIdentifier)
}
}
// return firstly {
// self.notifyForIncomingMessage(thread: contactThread)
// }.then {
// self.notifyForErrorMessage(thread: contactThread)
// }.then {
// self.notifyUserForThreadlessErrorMessage()
// }.done {
// UIApplication.shared.endBackgroundTask(taskIdentifier)
// }
// }
// func notifyForIncomingCall(thread: TSContactThread) -> Guarantee<Void> {
// Logger.info("⚠️ will present notification after delay")
@ -161,34 +160,6 @@ class DebugUINotifications: DebugUIPage {
// }
// }
func notifyForIncomingMessage(thread: TSThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {
self.readWrite { transaction in
let factory = IncomingMessageFactory()
factory.threadCreator = { _ in return thread }
let incomingMessage = factory.create(transaction: transaction)
self.notificationPresenter.notifyUser(for: incomingMessage,
in: thread,
transaction: transaction)
}
}
}
func notifyForErrorMessage(thread: TSThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {
let errorMessage = TSErrorMessage(timestamp: NSDate.ows_millisecondTimeStamp(),
in: thread,
failedMessageType: TSErrorMessageType.invalidMessage)
self.readWrite { transaction in
self.notificationPresenter.notifyUser(for: errorMessage, thread: thread, transaction: transaction)
}
}
}
func notifyUserForThreadlessErrorMessage() -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {

4
Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
class DebugUIProfile: DebugUIPage {

6
Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
View file

@ -5,9 +5,9 @@
#import "DebugUISessionState.h"
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/TSContactThread.h>
#import <SignalUtilitiesKit/OWSIdentityManager.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/TSContactThread.h>
NS_ASSUME_NONNULL_BEGIN

21
Signal/src/ViewControllers/DebugUI/DebugUIStress.m
View file

@ -7,16 +7,17 @@
#import "OWSTableViewController.h"
#import "SignalApp.h"
#import "ThreadUtil.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SessionServiceKit/OWSDynamicOutgoingMessage.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSThread.h>
#import <SessionProtocolKit/Cryptography.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSDynamicOutgoingMessage.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
NS_ASSUME_NONNULL_BEGIN

38
Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
View file

@ -7,26 +7,26 @@
#import "OWSTableViewController.h"
#import "Session-Swift.h"
#import "ThreadUtil.h"
#import <SessionAxolotlKit/PreKeyBundle.h>
#import <SessionProtocolKit/PreKeyBundle.h>
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SessionServiceKit/OWSBlockingManager.h>
#import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/OWSSyncGroupsMessage.h>
#import <SessionServiceKit/OWSSyncGroupsRequestMessage.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSCall.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSIncomingMessage.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SessionServiceKit/TSThread.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSBatchMessageProcessor.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/OWSReadReceiptManager.h>
#import <SignalUtilitiesKit/OWSSyncGroupsMessage.h>
#import <SignalUtilitiesKit/OWSSyncGroupsRequestMessage.h>
#import <SignalUtilitiesKit/OWSVerificationStateChangeMessage.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSCall.h>
#import <SignalUtilitiesKit/TSDatabaseView.h>
#import <SignalUtilitiesKit/TSIncomingMessage.h>
#import <SignalUtilitiesKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalUtilitiesKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
View file

@ -12,8 +12,8 @@
#import "DebugUIStress.h"
#import "DebugUISyncMessages.h"
#import "Session-Swift.h"
#import <SessionServiceKit/TSContactThread.h>
#import <SessionServiceKit/TSThread.h>
#import <SignalUtilitiesKit/TSContactThread.h>
#import <SignalUtilitiesKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/GifPicker/GifPickerCell.swift
View file

@ -4,8 +4,8 @@
import Foundation
import PromiseKit
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
import YYImage
class GifPickerCell: UICollectionViewCell {

4
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
View file

@ -3,9 +3,9 @@
//
import Foundation
import SessionServiceKit
import SignalUtilitiesKit
import Reachability
import SignalMessaging
import SignalUtilitiesKit
import PromiseKit
@objc

2
Signal/src/ViewControllers/InviteFlow.swift
View file

@ -6,7 +6,7 @@ import Foundation
import Social
import ContactsUI
import MessageUI
import SessionServiceKit
import SignalUtilitiesKit
@objc(OWSInviteFlow)
class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailComposeViewControllerDelegate, ContactsPickerDelegate {

4
Signal/src/ViewControllers/LongTextViewController.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
@objc
public protocol LongTextViewDelegate {

2
Signal/src/ViewControllers/MediaDetailViewController.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSViewController.h>
#import <SignalUtilitiesKit/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/MediaDetailViewController.m
View file

@ -16,8 +16,8 @@
#import <AVKit/AVKit.h>
#import <MediaPlayer/MPMoviePlayerViewController.h>
#import <MediaPlayer/MediaPlayer.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SessionServiceKit/NSData+Image.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/NSData+Image.h>
#import <YYImage/YYImage.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/MediaPageViewController.swift
View file

@ -679,7 +679,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
case let incomingMessage as TSIncomingMessage:
let hexEncodedPublicKey = incomingMessage.authorId
if incomingMessage.thread.isGroupThread() {
var publicChat: PublicChat?
var publicChat: OpenGroup?
OWSPrimaryStorage.shared().dbReadConnection.read { transaction in
publicChat = LokiDatabaseUtilities.getPublicChat(for: incomingMessage.thread.uniqueId!, in: transaction)
}

4
Signal/src/ViewControllers/MessageDetailViewController.swift
View file

@ -3,8 +3,8 @@
//
import Foundation
import SessionServiceKit
import SignalMessaging
import SignalUtilitiesKit
import SignalUtilitiesKit
@objc
enum MessageMetadataViewMode: UInt {

2
Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
View file

@ -3,7 +3,7 @@
//
import Foundation
import SessionServiceKit
import SignalUtilitiesKit
@objc
public class SafetyNumberConfirmationAlert: NSObject {

8
Signal/src/ViewControllers/SignalsNavigationController.m
View file

@ -4,10 +4,10 @@
#import "SignalsNavigationController.h"
#import "Session-Swift.h"
#import <SignalMessaging/UIUtil.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionServiceKit/OWSSignalService.h>
#import <SessionServiceKit/TSSocketManager.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
#import <SignalUtilitiesKit/OWSSignalService.h>
#import <SignalUtilitiesKit/TSSocketManager.h>
static double const STALLED_PROGRESS = 0.9;

4
Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m
View file

@ -6,8 +6,8 @@
#import "BlockListUIUtils.h"
#import "ContactsViewHelper.h"
#import "Session-Swift.h"
#import <SignalMessaging/OWSContactsManager.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/SignalAccount.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSViewController.h>
#import <SignalUtilitiesKit/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN

22
Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
View file

@ -9,17 +9,17 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h>
#import <SessionServiceKit/OWSError.h>
#import <SessionServiceKit/OWSFingerprint.h>
#import <SessionServiceKit/OWSFingerprintBuilder.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSInfoMessage.h>
#import <SessionProtocolKit/NSDate+OWS.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/OWSError.h>
#import <SignalUtilitiesKit/OWSFingerprint.h>
#import <SignalUtilitiesKit/OWSFingerprintBuilder.h>
#import <SignalUtilitiesKit/OWSIdentityManager.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSInfoMessage.h>
NS_ASSUME_NONNULL_BEGIN

Some files were not shown because too many files have changed in this diff Show more