oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP

This commit is contained in:
Niels Andriesse 2021-08-02 16:02:49 +10:00
parent ebff1f7ff3
commit 9dd1ab023b
9 changed files with 66 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Session.xcodeproj/project.pbxproj
View File

@ -197,6 +197,8 @@
B82A0C2D26B7B45200C1BCE3 /* CallKitCallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C1926B7B45200C1BCE3 /* CallKitCallManager.swift */; };
B82A0C2E26B7B45200C1BCE3 /* CallKitCallUIAdaptee.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C1A26B7B45200C1BCE3 /* CallKitCallUIAdaptee.swift */; };
B82A0C2F26B7B45200C1BCE3 /* CallUIAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C1B26B7B45200C1BCE3 /* CallUIAdapter.swift */; };
B82A0C3126B7BFF800C1BCE3 /* TSConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C3026B7BFF800C1BCE3 /* TSConstants.swift */; };
B82A0C3426B7C0C900C1BCE3 /* TSAccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C3326B7C0C900C1BCE3 /* TSAccountManager.swift */; };
B82B40882399EB0E00A248E7 /* LandingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40872399EB0E00A248E7 /* LandingVC.swift */; };
B82B408A2399EC0600A248E7 /* FakeChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40892399EC0600A248E7 /* FakeChatView.swift */; };
B82B408C239A068800A248E7 /* RegisterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408B239A068800A248E7 /* RegisterVC.swift */; };
@ -1224,6 +1226,8 @@
B82A0C1926B7B45200C1BCE3 /* CallKitCallManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallKitCallManager.swift; sourceTree = "<group>"; };
B82A0C1A26B7B45200C1BCE3 /* CallKitCallUIAdaptee.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallKitCallUIAdaptee.swift; sourceTree = "<group>"; };
B82A0C1B26B7B45200C1BCE3 /* CallUIAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallUIAdapter.swift; sourceTree = "<group>"; };
B82A0C3026B7BFF800C1BCE3 /* TSConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSConstants.swift; sourceTree = "<group>"; };
B82A0C3326B7C0C900C1BCE3 /* TSAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAccountManager.swift; sourceTree = "<group>"; };
B82B40872399EB0E00A248E7 /* LandingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingVC.swift; sourceTree = "<group>"; };
B82B40892399EC0600A248E7 /* FakeChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeChatView.swift; sourceTree = "<group>"; };
B82B408B239A068800A248E7 /* RegisterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterVC.swift; sourceTree = "<group>"; };
@ -2099,6 +2103,7 @@
B83F2B87240CB75A000A54AB /* UIImage+Scaling.swift */,
C31A6C59247F214E001123EF /* UIView+Glow.swift */,
C3548F0724456AB6009433A8 /* UIView+Wrapping.swift */,
B82A0C3026B7BFF800C1BCE3 /* TSConstants.swift */,
);
path = Utilities;
sourceTree = "<group>";
@ -2269,6 +2274,14 @@
path = CallKit;
sourceTree = "<group>";
};
B82A0C3226B7C0AD00C1BCE3 /* Utilities */ = {
isa = PBXGroup;
children = (
B82A0C3326B7C0C900C1BCE3 /* TSAccountManager.swift */,
);
path = Utilities;
sourceTree = "<group>";
};
B835246C25C38AA20089A44F /* Conversations */ = {
isa = PBXGroup;
children = (
@ -2316,6 +2329,7 @@
B882A77426AE878300B5AB69 /* Individual */,
B882A75126AE878300B5AB69 /* Group */,
B82A0C0326B7B45200C1BCE3 /* UserInterface */,
B82A0C3226B7C0AD00C1BCE3 /* Utilities */,
);
path = Calls;
sourceTree = "<group>";
@ -5071,6 +5085,7 @@
B8F5F71A25F1B35C003BF8D4 /* MediaPlaceholderView.swift in Sources */,
341341EF2187467A00192D59 /* ConversationViewModel.m in Sources */,
4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */,
B82A0C3426B7C0C900C1BCE3 /* TSAccountManager.swift in Sources */,
C331FFF32558FF0300070591 /* PathStatusView.swift in Sources */,
B8569AD325CBA13D00DBA3DB /* MediaTextOverlayView.swift in Sources */,
4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */,
@ -5108,6 +5123,7 @@
4CA46F4C219CCC630038ABDE /* CaptionView.swift in Sources */,
B82A0C2D26B7B45200C1BCE3 /* CallKitCallManager.swift in Sources */,
C328253025CA55370062D0A7 /* ContextMenuWindow.swift in Sources */,
B82A0C3126B7BFF800C1BCE3 /* TSConstants.swift in Sources */,
B82A0C2426B7B45200C1BCE3 /* GroupCallTooltip.swift in Sources */,
B82A0C1E26B7B45200C1BCE3 /* GroupCallMemberSheet.swift in Sources */,
340FC8B7204DAC8D007AEB0F /* OWSConversationSettingsViewController.m in Sources */,

2
Session/Calls/Individual/IndividualCallService.swift
View File

@ -1287,7 +1287,7 @@ import SessionMessagingKit
return
}
guard !OWSWindowManager.shared.hasCall else {
guard !OWSWindowManager.shared().hasCall() else {
// call screen is visible
return
}

6
Session/Calls/SignalCall.swift
View File

@ -114,7 +114,7 @@ public class SignalCall: NSObject, CallManagerCallReference {
case .group(let call):
return call.remoteDeviceStates.values.map { $0.address }
case .individual(let call):
return [call.remoteAddress]
return [call.publicKey]
}
}
@ -141,10 +141,8 @@ public class SignalCall: NSObject, CallManagerCallReference {
}
public class func groupCall(thread: TSGroupThread) -> SignalCall? {
owsAssertDebug(thread.groupModel.groupsVersion == .V2)
let videoCaptureController = VideoCaptureController()
let sfuURL = DebugFlags.callingUseTestSFU.get() ? TSConstants.sfuTestURL : TSConstants.sfuURL
let sfuURL = TSConstants.sfuURL
guard let groupCall = Self.callService.callManager.createGroupCall(
groupId: thread.groupModel.groupId,

2
Session/Calls/UserInterface/CallHeader.swift
View File

@ -328,7 +328,7 @@ private class GroupMembersButton: UIButton {
}
func updateMemberCount(_ count: Int) {
countLabel.text = String(OWSFormat.formatInt(count))
countLabel.text = String(OWSFormat.formatInt(Int32(count)))
}
required init?(coder: NSCoder) {

16
Session/Calls/UserInterface/Group/GroupCallNotificationView.swift
View File

@ -172,16 +172,10 @@ private class BannerView: UIView {
backgroundColor = .black.withAlphaComponent(0.4)
}
let displayNames = databaseStorage.read { transaction in
return addresses.map { address in
return (
displayName: self.contactsManager.displayName(for: address, transaction: transaction),
comparableName: self.contactsManager.comparableName(for: address, transaction: transaction)
)
}
}.sorted { $0.comparableName.caseInsensitiveCompare($1.comparableName) == .orderedAscending }
.map { $0.displayName }
let displayNames = addresses.map { publicKey in
Storage.shared.getContact(with: publicKey)?.displayName(for: .regular) ?? publicKey
}.sorted { $0 < $1 }
let actionText: String
if displayNames.count > 2 {
let formatText = action == .join
@ -255,7 +249,7 @@ private class BannerView: UIView {
hStack.addArrangedSubview(label)
label.setCompressionResistanceHorizontalHigh()
label.numberOfLines = 0
label.font = UIFont.ows_dynamicTypeSubheadlineClamped.ows_semibold
label.font = .boldSystemFont(ofSize: Values.mediumFontSize)
label.textColor = .ows_white
label.text = actionText

4
Session/Calls/UserInterface/Group/GroupCallVideoGridLayout.swift
View File

@ -92,8 +92,8 @@ class GroupCallVideoGridLayout: UICollectionViewLayout {
guard let (numberOfRows, numberOfColumns) = possibleGrids.first else { return owsFailDebug("missing grid") }
let totalViewWidth = collectionView.width
let totalViewHeight = collectionView.height
let totalViewWidth = collectionView.width()
let totalViewHeight = collectionView.height()
let verticalSpacersWidth = (2 * vInset) + (vSpacing * (CGFloat(numberOfRows) - 1))
let verticalCellSpace = totalViewHeight - verticalSpacersWidth

11
Session/Calls/UserInterface/Individual/CallKit/CallKitCallManager.swift
View File

@ -36,15 +36,8 @@ final class CallKitCallManager: NSObject {
let handle: CXHandle
if showNamesOnCallScreen {
let type: CXHandle.HandleType
let value: String
if let phoneNumber = call.individualCall.remoteAddress.phoneNumber {
type = .phoneNumber
value = phoneNumber
} else {
type = .generic
value = call.individualCall.remoteAddress.stringForDisplay
}
let type: CXHandle.HandleType = .phoneNumber
let value: String = call.individualCall.publicKey
handle = CXHandle(type: type, value: value)
} else {
let callKitId = CallKitCallManager.kAnonymousCallHandlePrefix + call.individualCall.localId.uuidString

29
Session/Calls/Utilities/TSAccountManager.swift Normal file
View File

@ -0,0 +1,29 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
import PromiseKit
extension TSAccountManager {
func getTurnServerInfo() -> Promise<TurnServerInfo> {
let request = TSRequest(url: URL(string: "v1/accounts/turn")!, method: "GET", parameters: [:])
return Promise { resolver in
self.networkManager.makeRequest(request, success: { (_: URLSessionDataTask, responseObject: Any?) in
guard responseObject != nil else {
return resolver.reject(OWSErrorMakeUnableToProcessServerResponseError())
}
if let responseDictionary = responseObject as? [String: AnyObject] {
if let turnServerInfo = TurnServerInfo(attributes: responseDictionary) {
return resolver.fulfill(turnServerInfo)
}
Logger.error("unexpected server response:\(responseDictionary)")
}
return resolver.reject(OWSErrorMakeUnableToProcessServerResponseError())
}, failure: { (_: URLSessionDataTask, error: Error) in
return resolver.reject(error)
})
}
}
}

8
Session/Utilities/TSConstants.swift Normal file
View File

@ -0,0 +1,8 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
enum TSConstants {
static let sfuURL = "https://sfu.voip.signal.org"
}