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

Don't ask for camera permissions if app is not active.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent f757b7dcb1
commit f86882b5ff
3 changed files with 115 additions and 105 deletions
Show Stats Download Patch File Download Diff File

1
Signal/src/Signal-Bridging-Header.h
Unescape Escape View File

@ -39,6 +39,7 @@
#import "UIImage+OWS.h" #import "UIImage+OWS.h"
#import "UIUtil.h" #import "UIUtil.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import "UIViewController+CameraPermissions.h"
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <AxolotlKit/NSData+keyVersionByte.h> #import <AxolotlKit/NSData+keyVersionByte.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

211
Signal/src/call/CallService.swift
Unescape Escape View File

@ -154,7 +154,7 @@ protocol CallServiceObserver: class {
Logger.debug("\(self.TAG) .call setter: \(oldValue?.identifiersForLogs as Optional) -> \(call?.identifiersForLogs as Optional)") Logger.debug("\(self.TAG) .call setter: \(oldValue?.identifiersForLogs as Optional) -> \(call?.identifiersForLogs as Optional)")
for observer in observers { for observer in observers {
observer.value?.didUpdateCall(call:call) observer.value?.didUpdateCall(call: call)
} }
} }
} }
@ -227,13 +227,13 @@ protocol CallServiceObserver: class {
self.createCallUIAdapter() self.createCallUIAdapter()
NotificationCenter.default.addObserver(self, NotificationCenter.default.addObserver(self,
selector:#selector(didEnterBackground), selector: #selector(didEnterBackground),
name:NSNotification.Name.UIApplicationDidEnterBackground, name: NSNotification.Name.UIApplicationDidEnterBackground,
object:nil) object: nil)
NotificationCenter.default.addObserver(self, NotificationCenter.default.addObserver(self,
selector:#selector(didBecomeActive), selector: #selector(didBecomeActive),
name:NSNotification.Name.UIApplicationDidBecomeActive, name: NSNotification.Name.UIApplicationDidBecomeActive,
object:nil) object: nil)
} }
deinit { deinit {
@ -275,8 +275,8 @@ protocol CallServiceObserver: class {
let errorDescription = "\(TAG) call was unexpectedly already set." let errorDescription = "\(TAG) call was unexpectedly already set."
Logger.error(errorDescription) Logger.error(errorDescription)
call.state = .localFailure call.state = .localFailure
OWSProdError(OWSAnalyticsEvents.callServiceCallAlreadySet(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallAlreadySet(), file: #file, function: #function, line: #line)
return Promise(error: CallError.assertionError(description:errorDescription)) return Promise(error: CallError.assertionError(description: errorDescription))
} }
self.call = call self.call = call
@ -292,14 +292,14 @@ protocol CallServiceObserver: class {
Logger.debug("\(self.TAG) got ice servers:\(iceServers) for call: \(call.identifiersForLogs)") Logger.debug("\(self.TAG) got ice servers:\(iceServers) for call: \(call.identifiersForLogs)")
guard self.call == call else { guard self.call == call else {
throw CallError.obsoleteCall(description:"obsolete call in \(#function)") throw CallError.obsoleteCall(description: "obsolete call in \(#function)")
} }
guard self.peerConnectionClient == nil else { guard self.peerConnectionClient == nil else {
let errorDescription = "\(self.TAG) peerconnection was unexpectedly already set." let errorDescription = "\(self.TAG) peerconnection was unexpectedly already set."
Logger.error(errorDescription) Logger.error(errorDescription)
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionAlreadySet(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionAlreadySet(), file: #file, function: #function, line: #line)
throw CallError.assertionError(description:errorDescription) throw CallError.assertionError(description: errorDescription)
} }
let useTurnOnly = Environment.getCurrent().preferences.doCallsHideIPAddress() let useTurnOnly = Environment.getCurrent().preferences.doCallsHideIPAddress()
@ -312,11 +312,11 @@ protocol CallServiceObserver: class {
return peerConnectionClient.createOffer() return peerConnectionClient.createOffer()
}.then { (sessionDescription: HardenedRTCSessionDescription) -> Promise<Void> in }.then { (sessionDescription: HardenedRTCSessionDescription) -> Promise<Void> in
guard self.call == call else { guard self.call == call else {
throw CallError.obsoleteCall(description:"obsolete call in \(#function)") throw CallError.obsoleteCall(description: "obsolete call in \(#function)")
} }
guard let peerConnectionClient = self.peerConnectionClient else { guard let peerConnectionClient = self.peerConnectionClient else {
owsFail("Missing peerConnectionClient in \(#function)") owsFail("Missing peerConnectionClient in \(#function)")
throw CallError.obsoleteCall(description:"Missing peerConnectionClient in \(#function)") throw CallError.obsoleteCall(description: "Missing peerConnectionClient in \(#function)")
} }
return peerConnectionClient.setLocalSessionDescription(sessionDescription).then { return peerConnectionClient.setLocalSessionDescription(sessionDescription).then {
@ -326,7 +326,7 @@ protocol CallServiceObserver: class {
} }
}.then { }.then {
guard self.call == call else { guard self.call == call else {
throw CallError.obsoleteCall(description:"obsolete call in \(#function)") throw CallError.obsoleteCall(description: "obsolete call in \(#function)")
} }
// For outgoing calls, wait until call offer is sent before we send any ICE updates, to ensure message ordering for // For outgoing calls, wait until call offer is sent before we send any ICE updates, to ensure message ordering for
@ -340,7 +340,7 @@ protocol CallServiceObserver: class {
// Don't let the outgoing call ring forever. We don't support inbound ringing forever anyway. // Don't let the outgoing call ring forever. We don't support inbound ringing forever anyway.
let timeout: Promise<Void> = after(interval: connectingTimeoutSeconds).then { () -> Void in let timeout: Promise<Void> = after(interval: connectingTimeoutSeconds).then { () -> Void in
// rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled // rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingOutgoing(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingOutgoing(), file: #file, function: #function, line: #line)
throw CallError.timeout(description: "timed out waiting to receive call answer") throw CallError.timeout(description: "timed out waiting to receive call answer")
} }
@ -353,10 +353,10 @@ protocol CallServiceObserver: class {
Logger.error("\(self.TAG) placing call \(call.identifiersForLogs) failed with error: \(error)") Logger.error("\(self.TAG) placing call \(call.identifiersForLogs) failed with error: \(error)")
if let callError = error as? CallError { if let callError = error as? CallError {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedInternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedInternal(), file: #file, function: #function, line: #line)
self.handleFailedCall(failedCall: call, error: callError) self.handleFailedCall(failedCall: call, error: callError)
} else { } else {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedExternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedExternal(), file: #file, function: #function, line: #line)
let externalError = CallError.externalError(underlyingError: error) let externalError = CallError.externalError(underlyingError: error)
self.handleFailedCall(failedCall: call, error: externalError) self.handleFailedCall(failedCall: call, error: externalError)
} }
@ -378,8 +378,8 @@ protocol CallServiceObserver: class {
} }
guard let fulfillReadyToSendIceUpdatesPromise = self.fulfillReadyToSendIceUpdatesPromise else { guard let fulfillReadyToSendIceUpdatesPromise = self.fulfillReadyToSendIceUpdatesPromise else {
OWSProdError(OWSAnalyticsEvents.callServiceMissingFulfillReadyToSendIceUpdatesPromise(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceMissingFulfillReadyToSendIceUpdatesPromise(), file: #file, function: #function, line: #line)
self.handleFailedCall(failedCall: call, error: CallError.assertionError(description:"failed to create fulfillReadyToSendIceUpdatesPromise")) self.handleFailedCall(failedCall: call, error: CallError.assertionError(description: "failed to create fulfillReadyToSendIceUpdatesPromise"))
return return
} }
@ -417,8 +417,8 @@ protocol CallServiceObserver: class {
} }
guard let peerConnectionClient = self.peerConnectionClient else { guard let peerConnectionClient = self.peerConnectionClient else {
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"peerConnectionClient was unexpectedly nil in \(#function)")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "peerConnectionClient was unexpectedly nil in \(#function)"))
return return
} }
@ -427,10 +427,10 @@ protocol CallServiceObserver: class {
Logger.debug("\(self.TAG) successfully set remote description") Logger.debug("\(self.TAG) successfully set remote description")
}.catch { error in }.catch { error in
if let callError = error as? CallError { if let callError = error as? CallError {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorInternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorInternal(), file: #file, function: #function, line: #line)
self.handleFailedCall(failedCall: call, error: callError) self.handleFailedCall(failedCall: call, error: callError)
} else { } else {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorExternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorExternal(), file: #file, function: #function, line: #line)
let externalError = CallError.externalError(underlyingError: error) let externalError = CallError.externalError(underlyingError: error)
self.handleFailedCall(failedCall: call, error: externalError) self.handleFailedCall(failedCall: call, error: externalError)
} }
@ -567,7 +567,7 @@ protocol CallServiceObserver: class {
case .idle, .dialing, .remoteRinging: case .idle, .dialing, .remoteRinging:
// If both users are trying to call each other at the same time, // If both users are trying to call each other at the same time,
// both should see busy. // both should see busy.
handleRemoteBusy(thread:existingCall.thread, callId:existingCall.signalingId) handleRemoteBusy(thread: existingCall.thread, callId: existingCall.signalingId)
case .answering, .localRinging, .connected, .localFailure, .localHangup, .remoteHangup, .remoteBusy: case .answering, .localRinging, .connected, .localFailure, .localHangup, .remoteHangup, .remoteBusy:
// If one user calls another while the other has a "vestigial" call with // If one user calls another while the other has a "vestigial" call with
// that same user, fail the old call. // that same user, fail the old call.
@ -644,7 +644,7 @@ protocol CallServiceObserver: class {
let timeout: Promise<Void> = after(interval: connectingTimeoutSeconds).then { () -> Void in let timeout: Promise<Void> = after(interval: connectingTimeoutSeconds).then { () -> Void in
// rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled // rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingIncoming(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingIncoming(), file: #file, function: #function, line: #line)
throw CallError.timeout(description: "timed out waiting for call to connect") throw CallError.timeout(description: "timed out waiting for call to connect")
} }
@ -663,10 +663,10 @@ protocol CallServiceObserver: class {
return return
} }
if let callError = error as? CallError { if let callError = error as? CallError {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedInternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedInternal(), file: #file, function: #function, line: #line)
self.handleFailedCall(failedCall: newCall, error: callError) self.handleFailedCall(failedCall: newCall, error: callError)
} else { } else {
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedExternal(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedExternal(), file: #file, function: #function, line: #line)
let externalError = CallError.externalError(underlyingError: error) let externalError = CallError.externalError(underlyingError: error)
self.handleFailedCall(failedCall: newCall, error: externalError) self.handleFailedCall(failedCall: newCall, error: externalError)
} }
@ -706,7 +706,7 @@ protocol CallServiceObserver: class {
peerConnectionClient.addRemoteIceCandidate(RTCIceCandidate(sdp: sdp, sdpMLineIndex: lineIndex, sdpMid: mid)) peerConnectionClient.addRemoteIceCandidate(RTCIceCandidate(sdp: sdp, sdpMLineIndex: lineIndex, sdpMid: mid))
}.catch { error in }.catch { error in
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleRemoteAddedIceCandidate(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleRemoteAddedIceCandidate(), file: #file, function: #function, line: #line)
Logger.error("\(self.TAG) in \(#function) waitForPeerConnectionClient failed with error: \(error)") Logger.error("\(self.TAG) in \(#function) waitForPeerConnectionClient failed with error: \(error)")
}.retainUntilComplete() }.retainUntilComplete()
} }
@ -719,8 +719,8 @@ protocol CallServiceObserver: class {
AssertIsOnMainThread() AssertIsOnMainThread()
guard let call = self.call else { guard let call = self.call else {
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
self.handleFailedCurrentCall(error: CallError.assertionError(description:"ignoring local ice candidate, since there is no current call.")) self.handleFailedCurrentCall(error: CallError.assertionError(description: "ignoring local ice candidate, since there is no current call."))
return return
} }
@ -735,8 +735,8 @@ protocol CallServiceObserver: class {
guard call.state != .idle else { guard call.state != .idle else {
// This will only be called for the current peerConnectionClient, so // This will only be called for the current peerConnectionClient, so
// fail the current call. // fail the current call.
OWSProdError(OWSAnalyticsEvents.callServiceCallUnexpectedlyIdle(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallUnexpectedlyIdle(), file: #file, function: #function, line: #line)
self.handleFailedCurrentCall(error: CallError.assertionError(description:"ignoring local ice candidate, since call is now idle.")) self.handleFailedCurrentCall(error: CallError.assertionError(description: "ignoring local ice candidate, since call is now idle."))
return return
} }
@ -756,7 +756,7 @@ protocol CallServiceObserver: class {
return return
} }
}.catch { error in }.catch { error in
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalAddedIceCandidate(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalAddedIceCandidate(), file: #file, function: #function, line: #line)
Logger.error("\(self.TAG) in \(#function) waitUntilReadyToSendIceUpdates failed with error: \(error)") Logger.error("\(self.TAG) in \(#function) waitUntilReadyToSendIceUpdates failed with error: \(error)")
}.retainUntilComplete() }.retainUntilComplete()
} }
@ -773,8 +773,8 @@ protocol CallServiceObserver: class {
guard let call = self.call else { guard let call = self.call else {
// This will only be called for the current peerConnectionClient, so // This will only be called for the current peerConnectionClient, so
// fail the current call. // fail the current call.
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) ignoring \(#function) since there is no current call.")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) ignoring \(#function) since there is no current call."))
return return
} }
@ -848,16 +848,16 @@ protocol CallServiceObserver: class {
guard let call = self.call else { guard let call = self.call else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) call was unexpectedly nil in \(#function)") owsFail("\(TAG) call was unexpectedly nil in \(#function)")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) call was unexpectedly nil in \(#function)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) call was unexpectedly nil in \(#function)"))
return return
} }
guard call.localId == localId else { guard call.localId == localId else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)") owsFail("\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
return return
} }
@ -873,8 +873,8 @@ protocol CallServiceObserver: class {
Logger.debug("\(TAG) in \(#function)") Logger.debug("\(TAG) in \(#function)")
guard let currentCall = self.call else { guard let currentCall = self.call else {
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"\(TAG) ignoring \(#function) since there is no current call")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(TAG) ignoring \(#function) since there is no current call"))
return return
} }
@ -886,8 +886,8 @@ protocol CallServiceObserver: class {
} }
guard let peerConnectionClient = self.peerConnectionClient else { guard let peerConnectionClient = self.peerConnectionClient else {
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"\(TAG) missing peerconnection client in \(#function)")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(TAG) missing peerconnection client in \(#function)"))
return return
} }
@ -898,7 +898,7 @@ protocol CallServiceObserver: class {
call.callRecord = callRecord call.callRecord = callRecord
let message = DataChannelMessage.forConnected(callId: call.signalingId) let message = DataChannelMessage.forConnected(callId: call.signalingId)
peerConnectionClient.sendDataChannelMessage(data: message.asData(), description:"connected", isCritical:true) peerConnectionClient.sendDataChannelMessage(data: message.asData(), description: "connected", isCritical: true)
handleConnectedCall(call) handleConnectedCall(call)
} }
@ -912,8 +912,8 @@ protocol CallServiceObserver: class {
AssertIsOnMainThread() AssertIsOnMainThread()
guard let peerConnectionClient = self.peerConnectionClient else { guard let peerConnectionClient = self.peerConnectionClient else {
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"\(TAG) peerConnectionClient unexpectedly nil in \(#function)")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(TAG) peerConnectionClient unexpectedly nil in \(#function)"))
return return
} }
@ -943,16 +943,16 @@ protocol CallServiceObserver: class {
guard let call = self.call else { guard let call = self.call else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) call was unexpectedly nil in \(#function)") owsFail("\(TAG) call was unexpectedly nil in \(#function)")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) call was unexpectedly nil in \(#function)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) call was unexpectedly nil in \(#function)"))
return return
} }
guard call.localId == localId else { guard call.localId == localId else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)") owsFail("\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
return return
} }
@ -991,14 +991,14 @@ protocol CallServiceObserver: class {
AssertIsOnMainThread() AssertIsOnMainThread()
guard let currentCall = self.call else { guard let currentCall = self.call else {
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"\(TAG) ignoring \(#function) since there is no current call")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(TAG) ignoring \(#function) since there is no current call"))
return return
} }
guard call == currentCall else { guard call == currentCall else {
OWSProdError(OWSAnalyticsEvents.callServiceCallMismatch(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMismatch(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description:"\(TAG) ignoring \(#function) for call other than current call")) handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(TAG) ignoring \(#function) for call other than current call"))
return return
} }
@ -1013,7 +1013,7 @@ protocol CallServiceObserver: class {
if let peerConnectionClient = self.peerConnectionClient { if let peerConnectionClient = self.peerConnectionClient {
// If the call is connected, we can send the hangup via the data channel for faster hangup. // If the call is connected, we can send the hangup via the data channel for faster hangup.
let message = DataChannelMessage.forHangup(callId: call.signalingId) let message = DataChannelMessage.forHangup(callId: call.signalingId)
peerConnectionClient.sendDataChannelMessage(data: message.asData(), description:"hangup", isCritical:true) peerConnectionClient.sendDataChannelMessage(data: message.asData(), description: "hangup", isCritical: true)
} else { } else {
Logger.info("\(TAG) ending call before peer connection created. Device offline or quick hangup.") Logger.info("\(TAG) ending call before peer connection created. Device offline or quick hangup.")
} }
@ -1024,7 +1024,7 @@ protocol CallServiceObserver: class {
let sendPromise = self.messageSender.sendPromise(message: callMessage).then { let sendPromise = self.messageSender.sendPromise(message: callMessage).then {
Logger.debug("\(self.TAG) successfully sent hangup call message to \(call.thread.contactIdentifier())") Logger.debug("\(self.TAG) successfully sent hangup call message to \(call.thread.contactIdentifier())")
}.catch { error in }.catch { error in
OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalHungupCall(), file:#file, function:#function, line:#line) OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalHungupCall(), file: #file, function: #function, line: #line)
Logger.error("\(self.TAG) failed to send hangup call message to \(call.thread.contactIdentifier()) with error: \(error)") Logger.error("\(self.TAG) failed to send hangup call message to \(call.thread.contactIdentifier()) with error: \(error)")
} }
sendPromise.retainUntilComplete() sendPromise.retainUntilComplete()
@ -1103,38 +1103,39 @@ protocol CallServiceObserver: class {
func setHasLocalVideo(hasLocalVideo: Bool) { func setHasLocalVideo(hasLocalVideo: Bool) {
AssertIsOnMainThread() AssertIsOnMainThread()
let authStatus = AVCaptureDevice.authorizationStatus(forMediaType:AVMediaTypeVideo) guard let frontmostViewController = UIApplication.shared.frontmostViewController else {
switch authStatus { owsFail("\(TAG) could not identify frontmostViewController in \(#function)")
case .notDetermined:
Logger.debug("\(TAG) authStatus: AVAuthorizationStatusNotDetermined")
break
case .restricted:
Logger.debug("\(TAG) authStatus: AVAuthorizationStatusRestricted")
break
case .denied:
Logger.debug("\(TAG) authStatus: AVAuthorizationStatusDenied")
break
case .authorized:
Logger.debug("\(TAG) authStatus: AVAuthorizationStatusAuthorized")
break
}
// We don't need to worry about the user granting or remoting this permission
// during a call while the app is in the background, because changing this
// permission kills the app.
if authStatus != .authorized {
OWSAlerts.showAlert(withTitle:NSLocalizedString("MISSING_CAMERA_PERMISSION_TITLE", comment: "Alert title when camera is not authorized"),
message:NSLocalizedString("MISSING_CAMERA_PERMISSION_MESSAGE", comment: "Alert body when camera is not authorized"))
return return
} }
frontmostViewController.ows_ask(forCameraPermissions: { [weak self] in
// Success callback; camera permissions are granted.
guard let strongSelf = self else {
return
}
strongSelf.setHasLocalVideoWithCameraPermissions(hasLocalVideo: hasLocalVideo)
}, failureCallback: {
// Failed callback; camera permissions are _NOT_ granted.
// We don't need to worry about the user granting or remoting this permission
// during a call while the app is in the background, because changing this
// permission kills the app.
OWSAlerts.showAlert(withTitle: NSLocalizedString("MISSING_CAMERA_PERMISSION_TITLE", comment: "Alert title when camera is not authorized"),
message: NSLocalizedString("MISSING_CAMERA_PERMISSION_MESSAGE", comment: "Alert body when camera is not authorized"))
})
}
private func setHasLocalVideoWithCameraPermissions(hasLocalVideo: Bool) {
AssertIsOnMainThread()
guard let call = self.call else { guard let call = self.call else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) call was unexpectedly nil in \(#function)") owsFail("\(TAG) call was unexpectedly nil in \(#function)")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) call unexpectedly nil in \(#function)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) call unexpectedly nil in \(#function)"))
return return
} }
@ -1153,7 +1154,7 @@ protocol CallServiceObserver: class {
func handleCallKitStartVideo() { func handleCallKitStartVideo() {
AssertIsOnMainThread() AssertIsOnMainThread()
self.setHasLocalVideo(hasLocalVideo:true) self.setHasLocalVideo(hasLocalVideo: true)
} }
/** /**
@ -1172,8 +1173,8 @@ protocol CallServiceObserver: class {
guard let call = self.call else { guard let call = self.call else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) received data message, but there is no current call. Ignoring.") owsFail("\(TAG) received data message, but there is no current call. Ignoring.")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) received data message, but there is no current call. Ignoring.")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) received data message, but there is no current call. Ignoring."))
return return
} }
@ -1185,8 +1186,8 @@ protocol CallServiceObserver: class {
guard connected.id == call.signalingId else { guard connected.id == call.signalingId else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)") owsFail("\(TAG) received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)"))
return return
} }
@ -1201,8 +1202,8 @@ protocol CallServiceObserver: class {
guard hangup.id == call.signalingId else { guard hangup.id == call.signalingId else {
// This should never happen; return to a known good state. // This should never happen; return to a known good state.
owsFail("\(TAG) received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)") owsFail("\(TAG) received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description:"\(TAG) received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)")) handleFailedCurrentCall(error: CallError.assertionError(description: "\(TAG) received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)"))
return return
} }
@ -1309,8 +1310,8 @@ protocol CallServiceObserver: class {
} }
guard let readyToSendIceUpdatesPromise = self.readyToSendIceUpdatesPromise else { guard let readyToSendIceUpdatesPromise = self.readyToSendIceUpdatesPromise else {
OWSProdError(OWSAnalyticsEvents.callServiceCouldNotCreateReadyToSendIceUpdatesPromise(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCouldNotCreateReadyToSendIceUpdatesPromise(), file: #file, function: #function, line: #line)
return Promise(error: CallError.assertionError(description:"failed to create readyToSendIceUpdatesPromise")) return Promise(error: CallError.assertionError(description: "failed to create readyToSendIceUpdatesPromise"))
} }
return readyToSendIceUpdatesPromise return readyToSendIceUpdatesPromise
@ -1353,8 +1354,8 @@ protocol CallServiceObserver: class {
} }
guard let peerConnectionClientPromise = self.peerConnectionClientPromise else { guard let peerConnectionClientPromise = self.peerConnectionClientPromise else {
OWSProdError(OWSAnalyticsEvents.callServiceCouldNotCreatePeerConnectionClientPromise(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCouldNotCreatePeerConnectionClientPromise(), file: #file, function: #function, line: #line)
return Promise(error: CallError.assertionError(description:"failed to create peerConnectionClientPromise")) return Promise(error: CallError.assertionError(description: "failed to create peerConnectionClientPromise"))
} }
return peerConnectionClientPromise return peerConnectionClientPromise
@ -1433,8 +1434,8 @@ protocol CallServiceObserver: class {
public func handleFailedCall(failedCall: SignalCall?, error: CallError) { public func handleFailedCall(failedCall: SignalCall?, error: CallError) {
AssertIsOnMainThread() AssertIsOnMainThread()
if case CallError.assertionError(description:let description) = error { if case CallError.assertionError(description: let description) = error {
owsFail(description) Logger.error(description)
} }
if let failedCall = failedCall { if let failedCall = failedCall {
@ -1576,8 +1577,8 @@ protocol CallServiceObserver: class {
self.peerConnectionClient?.setLocalVideoEnabled(enabled: shouldHaveLocalVideoTrack) self.peerConnectionClient?.setLocalVideoEnabled(enabled: shouldHaveLocalVideoTrack)
let message = DataChannelMessage.forVideoStreamingStatus(callId: call.signalingId, enabled:shouldHaveLocalVideoTrack) let message = DataChannelMessage.forVideoStreamingStatus(callId: call.signalingId, enabled: shouldHaveLocalVideoTrack)
peerConnectionClient.sendDataChannelMessage(data: message.asData(), description:"videoStreamingStatus") peerConnectionClient.sendDataChannelMessage(data: message.asData(), description: "videoStreamingStatus")
} }
// MARK: - Observers // MARK: - Observers
@ -1592,9 +1593,9 @@ protocol CallServiceObserver: class {
let call = self.call let call = self.call
let localVideoTrack = self.localVideoTrack let localVideoTrack = self.localVideoTrack
let remoteVideoTrack = self.isRemoteVideoEnabled ? self.remoteVideoTrack : nil let remoteVideoTrack = self.isRemoteVideoEnabled ? self.remoteVideoTrack : nil
observer.didUpdateVideoTracks(call:call, observer.didUpdateVideoTracks(call: call,
localVideoTrack:localVideoTrack, localVideoTrack: localVideoTrack,
remoteVideoTrack:remoteVideoTrack) remoteVideoTrack: remoteVideoTrack)
} }
// The observer-related methods should be invoked on the main thread. // The observer-related methods should be invoked on the main thread.
@ -1621,9 +1622,9 @@ protocol CallServiceObserver: class {
let remoteVideoTrack = self.isRemoteVideoEnabled ? self.remoteVideoTrack : nil let remoteVideoTrack = self.isRemoteVideoEnabled ? self.remoteVideoTrack : nil
for observer in observers { for observer in observers {
observer.value?.didUpdateVideoTracks(call:call, observer.value?.didUpdateVideoTracks(call: call,
localVideoTrack:localVideoTrack, localVideoTrack: localVideoTrack,
remoteVideoTrack:remoteVideoTrack) remoteVideoTrack: remoteVideoTrack)
} }
} }
@ -1669,7 +1670,7 @@ protocol CallServiceObserver: class {
let frontmostViewController = UIApplication.shared.frontmostViewControllerIgnoringAlerts let frontmostViewController = UIApplication.shared.frontmostViewControllerIgnoringAlerts
guard nil != frontmostViewController as? CallViewController else { guard nil != frontmostViewController as? CallViewController else {
OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file:#file, function:#function, line:#line) OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file: #file, function: #function, line: #line)
owsFail("\(TAG) in \(#function) Call terminated due to call view presentation delay: \(frontmostViewController.debugDescription).") owsFail("\(TAG) in \(#function) Call terminated due to call view presentation delay: \(frontmostViewController.debugDescription).")
self.terminateCall() self.terminateCall()
return return

8
Signal/src/util/UIViewController+CameraPermissions.m
Unescape Escape View File

@ -19,12 +19,20 @@ NS_ASSUME_NONNULL_BEGIN
- (void)ows_askForCameraPermissions:(void (^)(void))permissionsGrantedCallback - (void)ows_askForCameraPermissions:(void (^)(void))permissionsGrantedCallback
failureCallback:(nullable void (^)(void))failureCallback failureCallback:(nullable void (^)(void))failureCallback
{ {
DDLogVerbose(@"%@ ows_askForCameraPermissions", NSStringFromClass(self.class));
// Avoid nil tests below. // Avoid nil tests below.
if (!failureCallback) { if (!failureCallback) {
failureCallback = ^{ failureCallback = ^{
}; };
} }
if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive) {
DDLogError(@"Skipping camera permissions request when app is not active.");
failureCallback();
return;
}
if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
DDLogError(@"Camera ImagePicker source not available"); DDLogError(@"Camera ImagePicker source not available");
failureCallback(); failureCallback();

Write Preview
Loading…
Cancel
Save