signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'mkirk/fixup-test-build' into release/2.31.0

Browse Source
This commit is contained in:
Michael Kirk 2018-10-29 13:37:45 -06:00
commit ef25b9c191
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal.xcodeproj/project.pbxproj
View File

@ -2960,8 +2960,8 @@
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework",
"$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework",
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
);
name = "[Carthage] Copy Frameworks";
outputPaths = (

16
Signal/test/mocks/MockEnvironment.m
View File

@ -8,6 +8,7 @@
#import <SignalMessaging/LockInteractionController.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -26,15 +27,20 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssertDebug(primaryStorage);
// TODO: We should probably mock this out.
OWSAudioSession *audioSession = [OWSAudioSession new];
LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
OWSPreferences *preferences = [OWSPreferences new];
OWSSounds *sounds = [[OWSSounds alloc] initWithPrimaryStorage:primaryStorage];
LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
id<OWSProximityMonitoringManager> proximityMonitoringManager = [OWSProximityMonitoringManagerImpl new];
OWSWindowManager *windowManager = [[OWSWindowManager alloc] initDefault];
self = [super initWithPreferences:preferences
sounds:sounds
lockInteractionController:lockInteractionController
windowManager:windowManager];
self = [super initWithAudioSession:audioSession
lockInteractionController:lockInteractionController
preferences:preferences
proximityMonitoringManager:proximityMonitoringManager
sounds:sounds
windowManager:windowManager];
OWSAssertDebug(self);
return self;
}

3
Signal/test/util/SearcherTest.swift
View File

@ -9,6 +9,9 @@ import XCTest
// TODO: We might be able to merge this with OWSFakeContactsManager.
@objc
class ConversationSearcherContactsManager: NSObject, ContactsManagerProtocol {
func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String {
return self.displayName(forPhoneIdentifier: recipientId)
}
func displayName(forPhoneIdentifier phoneNumber: String?) -> String {
if phoneNumber == aliceRecipientId {