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

Remove more usage of logTag.

Browse Source
pull/1/head
Matthew Chen 6 years ago
parent 7872145e18
commit 3fe7d7f9be
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

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

@ -362,7 +362,7 @@ private class SignalCallData: NSObject {
AssertIsOnMainThread()
guard self.call == nil else {
let errorDescription = "\(self.logTag) call was unexpectedly already set."
let errorDescription = "call was unexpectedly already set."
Logger.error(errorDescription)
call.state = .localFailure
OWSProdError(OWSAnalyticsEvents.callServiceCallAlreadySet(), file: #file, function: #function, line: #line)
@ -384,7 +384,7 @@ private class SignalCallData: NSObject {
}
guard callData.peerConnectionClient == nil else {
let errorDescription = "\(self.logTag) peerconnection was unexpectedly already set."
let errorDescription = "peerconnection was unexpectedly already set."
Logger.error(errorDescription)
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionAlreadySet(), file: #file, function: #function, line: #line)
throw CallError.assertionError(description: errorDescription)
@ -440,8 +440,8 @@ private class SignalCallData: NSObject {
return race(timeout, callData.callConnectedPromise)
}.then {
Logger.info(self.call == call
? "\(self.logTag) outgoing call connected: \(call.identifiersForLogs)."
: "\(self.logTag) obsolete outgoing call connected: \(call.identifiersForLogs).")
? "outgoing call connected: \(call.identifiersForLogs)."
: "obsolete outgoing call connected: \(call.identifiersForLogs).")
}.catch { error in
Logger.error("placing call \(call.identifiersForLogs) failed with error: \(error)")
@ -746,8 +746,8 @@ private class SignalCallData: NSObject {
return race(callData.callConnectedPromise, timeout)
}.then {
Logger.info(self.call == newCall
? "\(self.logTag) incoming call connected: \(newCall.identifiersForLogs)."
: "\(self.logTag) obsolete incoming call connected: \(newCall.identifiersForLogs).")
? "incoming call connected: \(newCall.identifiersForLogs)."
: "obsolete incoming call connected: \(newCall.identifiersForLogs).")
}.catch { error in
guard self.call == newCall else {
Logger.debug("ignoring error: \(error) for obsolete call: \(newCall.identifiersForLogs).")
@ -891,7 +891,7 @@ private class SignalCallData: NSObject {
// This will only be called for the current peerConnectionClient, so
// fail the current call.
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) ignoring \(#function) since there is no current call."))
handleFailedCurrentCall(error: CallError.assertionError(description: "ignoring \(#function) since there is no current call."))
return
}
@ -921,7 +921,7 @@ private class SignalCallData: NSObject {
// This will only be called for the current peerConnectionClient, so
// fail the current call.
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) ignoring \(#function) since there is no current call."))
handleFailedCurrentCall(error: CallError.assertionError(description: "ignoring \(#function) since there is no current call."))
return
}
@ -946,7 +946,7 @@ private class SignalCallData: NSObject {
guard let call = self.call else {
// This may happen if we hang up slightly before they hang up.
handleFailedCurrentCall(error: .obsoleteCall(description:"\(self.logTag) call was unexpectedly nil"))
handleFailedCurrentCall(error: .obsoleteCall(description:"call was unexpectedly nil"))
return
}
@ -991,7 +991,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("call was unexpectedly nil")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) call was unexpectedly nil"))
handleFailedCurrentCall(error: CallError.assertionError(description: "call was unexpectedly nil"))
return
}
@ -999,7 +999,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("callLocalId:\(localId) doesn't match current calls: \(call.localId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
handleFailedCurrentCall(error: CallError.assertionError(description: "callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
return
}
@ -1016,7 +1016,7 @@ private class SignalCallData: NSObject {
guard let currentCallData = self.callData else {
OWSProdError(OWSAnalyticsEvents.callServiceCallDataMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) callData unexpectedly nil"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "callData unexpectedly nil"))
return
}
@ -1029,7 +1029,7 @@ private class SignalCallData: NSObject {
guard let peerConnectionClient = self.peerConnectionClient else {
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) missing peerconnection client"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "missing peerconnection client"))
return
}
@ -1046,7 +1046,7 @@ private class SignalCallData: NSObject {
dataBuilder.setConnected(try connectedBuilder.build())
messageData = try dataBuilder.buildSerializedData()
} catch {
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) couldn't build proto"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "couldn't build proto"))
return
}
@ -1065,7 +1065,7 @@ private class SignalCallData: NSObject {
guard let peerConnectionClient = callData.peerConnectionClient else {
OWSProdError(OWSAnalyticsEvents.callServicePeerConnectionMissing(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) peerConnectionClient unexpectedly nil"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "peerConnectionClient unexpectedly nil"))
return
}
@ -1095,7 +1095,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("call was unexpectedly nil")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) call was unexpectedly nil"))
handleFailedCurrentCall(error: CallError.assertionError(description: "call was unexpectedly nil"))
return
}
@ -1103,7 +1103,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("callLocalId:\(localId) doesn't match current calls: \(call.localId)")
OWSProdError(OWSAnalyticsEvents.callServiceCallIdMismatch(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
handleFailedCurrentCall(error: CallError.assertionError(description: "callLocalId:\(localId) doesn't match current calls: \(call.localId)"))
return
}
@ -1151,7 +1151,7 @@ private class SignalCallData: NSObject {
guard call == currentCall else {
OWSProdError(OWSAnalyticsEvents.callServiceCallMismatch(), file: #file, function: #function, line: #line)
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) ignoring \(#function) for call other than current call"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "ignoring \(#function) for call other than current call"))
return
}
@ -1184,7 +1184,7 @@ private class SignalCallData: NSObject {
dataBuilder.setHangup(try hangupBuilder.build())
messageData = try dataBuilder.buildSerializedData()
} catch {
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) couldn't build proto"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "couldn't build proto"))
return
}
@ -1207,7 +1207,7 @@ private class SignalCallData: NSObject {
terminateCall()
} catch {
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "\(self.logTag) couldn't build proto"))
handleFailedCall(failedCall: call, error: CallError.assertionError(description: "couldn't build proto"))
}
}
@ -1363,7 +1363,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("received data message, but there is no current call. Ignoring.")
OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) received data message, but there is no current call. Ignoring."))
handleFailedCurrentCall(error: CallError.assertionError(description: "received data message, but there is no current call. Ignoring."))
return
}
let call = callData.call
@ -1375,7 +1375,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("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)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)"))
handleFailedCurrentCall(error: CallError.assertionError(description: "received connected message for call with id:\(connected.id) but current call has id:\(call.signalingId)"))
return
}
@ -1389,7 +1389,7 @@ private class SignalCallData: NSObject {
// This should never happen; return to a known good state.
owsFailDebug("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)
handleFailedCurrentCall(error: CallError.assertionError(description: "\(self.logTag) received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)"))
handleFailedCurrentCall(error: CallError.assertionError(description: "received hangup message for call with id:\(hangup.id) but current call has id:\(call.signalingId)"))
return
}

2
Signal/src/environment/PushRegistrationManager.swift
Unescape Escape View File

@ -258,7 +258,7 @@ public enum PushRegistrationError: Error {
guard let voipRegistry = self.voipRegistry else {
owsFailDebug("failed to initialize voipRegistry")
reject(PushRegistrationError.assertionError(description: "\(self.logTag) failed to initialize voipRegistry"))
reject(PushRegistrationError.assertionError(description: "failed to initialize voipRegistry"))
return promise.then { _ in
// coerce expected type of returned promise - we don't really care about the value,
// since this promise has been rejected. In practice this shouldn't happen

10
SignalMessaging/profiles/ProfileFetcherJob.swift
Unescape Escape View File

@ -187,23 +187,23 @@ public class SignalServiceProfile: NSObject {
self.recipientId = recipientId
guard let responseDict = rawResponse as? [String: Any?] else {
throw ValidationError.invalid(description: "\(SignalServiceProfile.logTag()) unexpected type: \(String(describing: rawResponse))")
throw ValidationError.invalid(description: "unexpected type: \(String(describing: rawResponse))")
}
guard let identityKeyString = responseDict["identityKey"] as? String else {
throw ValidationError.invalidIdentityKey(description: "\(SignalServiceProfile.logTag()) missing identity key: \(String(describing: rawResponse))")
throw ValidationError.invalidIdentityKey(description: "missing identity key: \(String(describing: rawResponse))")
}
guard let identityKeyWithType = Data(base64Encoded: identityKeyString) else {
throw ValidationError.invalidIdentityKey(description: "\(SignalServiceProfile.logTag()) unable to parse identity key: \(identityKeyString)")
throw ValidationError.invalidIdentityKey(description: "unable to parse identity key: \(identityKeyString)")
}
let kIdentityKeyLength = 33
guard identityKeyWithType.count == kIdentityKeyLength else {
throw ValidationError.invalidIdentityKey(description: "\(SignalServiceProfile.logTag()) malformed key \(identityKeyString) with decoded length: \(identityKeyWithType.count)")
throw ValidationError.invalidIdentityKey(description: "malformed key \(identityKeyString) with decoded length: \(identityKeyWithType.count)")
}
if let profileNameString = responseDict["name"] as? String {
guard let data = Data(base64Encoded: profileNameString) else {
throw ValidationError.invalidProfileName(description: "\(SignalServiceProfile.logTag()) unable to parse profile name: \(profileNameString)")
throw ValidationError.invalidProfileName(description: "unable to parse profile name: \(profileNameString)")
}
self.profileNameEncrypted = data
} else {

Write Preview
Loading…
Cancel
Save