Skip to content

Commit

Permalink
#4351 - Adopted the new MXLog and replaced NSLog throughout the appli…
Browse files Browse the repository at this point in the history 
…cation.
  • Loading branch information
@stefanceriu
stefanceriu committed Jun 2, 2021
1 parent 9981e12 commit 0c98d01
Show file tree
Hide file tree
Showing 78 changed files with 636 additions and 606 deletions.
2 changes: 1 addition & 1 deletion Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ - (void)addTimestampLabelForComponentIndex:(NSInteger)componentIndex
{
if (!self.bubbleInfoContainer)
{
NSLog(@"[MXKRoomBubbleTableViewCell+Riot] bubbleInfoContainer property is missing for cell class: %@", NSStringFromClass(self.class));
MXLogDebug(@"[MXKRoomBubbleTableViewCell+Riot] bubbleInfoContainer property is missing for cell class: %@", NSStringFromClass(self.class));
return;
}

Expand Down
8 changes: 4 additions & 4 deletions Riot/Categories/MXRoom+Riot.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ - (void)setRoomTag:(NSString*)tag completion:(void (^)(void))completion

NSString* tagOrder = [self.mxSession tagOrderToBeAtIndex:0 from:NSNotFound withTag:tag];

NSLog(@"[MXRoom+Riot] Update the room %@ tag from %@ to %@ with tag order %@", self.roomId, oldTag, tag, tagOrder);
MXLogDebug(@"[MXRoom+Riot] Update the room %@ tag from %@ to %@ with tag order %@", self.roomId, oldTag, tag, tagOrder);

[self replaceTag:oldTag
byTag:tag
Expand All @@ -57,7 +57,7 @@ - (void)setRoomTag:(NSString*)tag completion:(void (^)(void))completion

} failure:^(NSError *error) {

NSLog(@"[MXRoom+Riot] Failed to update the tag %@ of room (%@)", tag, self.roomId);
MXLogDebug(@"[MXRoom+Riot] Failed to update the tag %@ of room (%@)", tag, self.roomId);
NSString *userId = self.mxSession.myUser.userId;

// Notify user
Expand Down Expand Up @@ -166,7 +166,7 @@ - (void)mute:(void (^)(void))completion
// Check whether there is no pending update for this room
if (self.notificationCenterDidUpdateObserver)
{
NSLog(@"[MXRoom+Riot] Request in progress: ignore push rule update");
MXLogDebug(@"[MXRoom+Riot] Request in progress: ignore push rule update");
if (completion)
{
completion();
Expand Down Expand Up @@ -244,7 +244,7 @@ - (void)mentionsOnly:(void (^)(void))completion
// Check whether there is no pending update for this room
if (self.notificationCenterDidUpdateObserver)
{
NSLog(@"[MXRoom+Riot] Request in progress: ignore push rule update");
MXLogDebug(@"[MXRoom+Riot] Request in progress: ignore push rule update");
if (completion)
{
completion();
Expand Down
5 changes: 3 additions & 2 deletions Riot/Categories/UNUserNotificationCenter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import Foundation
import UserNotifications
import MatrixSDK

@objc extension UNUserNotificationCenter {

Expand All @@ -24,7 +25,7 @@ import UserNotifications
// get identifiers of notifications whose category identifiers are "TO_BE_REMOVED"
let identifiersToBeRemoved = notifications.compactMap({ $0.request.content.categoryIdentifier == Constants.toBeRemovedNotificationCategoryIdentifier ? $0.request.identifier : nil })

NSLog("[UNUserNotificationCenter] removeUnwantedNotifications: Removing \(identifiersToBeRemoved.count) notifications.")
MXLog.debug("[UNUserNotificationCenter] removeUnwantedNotifications: Removing \(identifiersToBeRemoved.count) notifications.")
// remove the notifications with these id's
UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: identifiersToBeRemoved)
}
Expand Down Expand Up @@ -52,7 +53,7 @@ import UserNotifications
// get identifiers of notifications that should be removed
let identifiersToBeRemoved = notifications.compactMap({ notificationShouldBeRemoved($0) ? $0.request.identifier : nil })

NSLog("[UNUserNotificationCenter] removeCallNotifications: Removing \(identifiersToBeRemoved.count) notifications.")
MXLog.debug("[UNUserNotificationCenter] removeCallNotifications: Removing \(identifiersToBeRemoved.count) notifications.")
// remove the notifications with these id's
UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: identifiersToBeRemoved)
}
Expand Down
2 changes: 1 addition & 1 deletion Riot/Managers/Analytics/Analytics.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ - (void)start
}
else
{
NSLog(@"[AppDelegate] The user decided to not send analytics");
MXLogDebug(@"[AppDelegate] The user decided to not send analytics");
matomoTracker.isOptedOut = YES;
[MXLogger logCrashes:NO];
}
Expand Down
2 changes: 1 addition & 1 deletion Riot/Managers/Analytics/DecryptionFailureTracker.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ - (void)checkFailures
failuresCounts[failure.reason] = @(failuresCounts[failure.reason].unsignedIntegerValue + 1);
}

NSLog(@"[DecryptionFailureTracker] trackFailures: %@", failuresCounts);
MXLogDebug(@"[DecryptionFailureTracker] trackFailures: %@", failuresCounts);

for (NSString *reason in failuresCounts)
{
Expand Down
4 changes: 2 additions & 2 deletions Riot/Managers/BugReport/RageShakeManager.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ - (void)startShaking:(UIResponder*)responder {
&& RiotSettings.shared.enableRageShake
&& !confirmationAlert)
{
NSLog(@"[RageShakeManager] Start shaking with [%@]", [responder class]);
MXLogDebug(@"[RageShakeManager] Start shaking with [%@]", [responder class]);

startShakingTimeStamp = [[NSDate date] timeIntervalSince1970];
isShaking = YES;
Expand All @@ -124,7 +124,7 @@ - (void)startShaking:(UIResponder*)responder {

- (void)stopShaking:(UIResponder*)responder
{
NSLog(@"[RageShakeManager] Stop shaking with [%@]", [responder class]);
MXLogDebug(@"[RageShakeManager] Stop shaking with [%@]", [responder class]);

if (isShaking && [AppDelegate theDelegate].isAppForeground && !confirmationAlert
&& (([[NSDate date] timeIntervalSince1970] - startShakingTimeStamp) > RAGESHAKEMANAGER_MINIMUM_SHAKING_DURATION))
Expand Down
80 changes: 40 additions & 40 deletions Riot/Managers/Call/CallPresenter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@ class CallPresenter: NSObject {

/// Start the service
func start() {
NSLog("[CallPresenter] start")
MXLog.debug("[CallPresenter] start")

addCallObservers()
startCallTimer()
}

/// Stop the service
func stop() {
NSLog("[CallPresenter] stop")
MXLog.debug("[CallPresenter] stop")

removeCallObservers()
stopCallTimer()
}

/// Method to be called when the call status bar is tapped.
func callStatusBarTapped() {
NSLog("[CallPresenter] callStatusBarTapped")
MXLog.debug("[CallPresenter] callStatusBarTapped")

if let callVC = (inBarCallVC ?? activeCallVC) as? CallViewController {
dismissCallBar(for: callVC)
Expand All @@ -152,7 +152,7 @@ class CallPresenter: NSObject {
/// Open the Jitsi view controller from a widget.
/// - Parameter widget: the jitsi widget
func displayJitsiCall(withWidget widget: Widget) {
NSLog("[CallPresenter] displayJitsiCall: for widget: \(widget.widgetId)")
MXLog.debug("[CallPresenter] displayJitsiCall: for widget: \(widget.widgetId)")

#if canImport(JitsiMeetSDK)
let createJitsiBlock = { [weak self] in
Expand Down Expand Up @@ -191,26 +191,26 @@ class CallPresenter: NSObject {
}

private func startJitsiCall(withWidget widget: Widget) {
NSLog("[CallPresenter] startJitsiCall")
MXLog.debug("[CallPresenter] startJitsiCall")

if let uuid = self.jitsiCalls.first(where: { $0.value.widgetId == widget.widgetId })?.key {
// this Jitsi call is already managed by this class, no need to report the call again
NSLog("[CallPresenter] startJitsiCall: already managed with id: \(uuid.uuidString)")
MXLog.debug("[CallPresenter] startJitsiCall: already managed with id: \(uuid.uuidString)")
return
}

guard let roomId = widget.roomId else {
NSLog("[CallPresenter] startJitsiCall: no roomId on widget")
MXLog.debug("[CallPresenter] startJitsiCall: no roomId on widget")
return
}

guard let session = sessions.first else {
NSLog("[CallPresenter] startJitsiCall: no active session")
MXLog.debug("[CallPresenter] startJitsiCall: no active session")
return
}

guard let room = session.room(withRoomId: roomId) else {
NSLog("[CallPresenter] startJitsiCall: unknown room: \(roomId)")
MXLog.debug("[CallPresenter] startJitsiCall: unknown room: \(roomId)")
return
}

Expand All @@ -219,10 +219,10 @@ class CallPresenter: NSObject {
let startCallAction = CXStartCallAction(call: newUUID, handle: handle)
let transaction = CXTransaction(action: startCallAction)

NSLog("[CallPresenter] startJitsiCall: new call with id: \(newUUID.uuidString)")
MXLog.debug("[CallPresenter] startJitsiCall: new call with id: \(newUUID.uuidString)")

JMCallKitProxy.request(transaction) { (error) in
NSLog("[CallPresenter] startJitsiCall: JMCallKitProxy returned \(String(describing: error))")
MXLog.debug("[CallPresenter] startJitsiCall: JMCallKitProxy returned \(String(describing: error))")

if error == nil {
JMCallKitProxy.reportCallUpdate(with: newUUID,
Expand All @@ -237,11 +237,11 @@ class CallPresenter: NSObject {
}

func endActiveJitsiCall() {
NSLog("[CallPresenter] endActiveJitsiCall")
MXLog.debug("[CallPresenter] endActiveJitsiCall")

guard let jitsiVC = jitsiVC else {
// there is no active Jitsi call
NSLog("[CallPresenter] endActiveJitsiCall: no active Jitsi call")
MXLog.debug("[CallPresenter] endActiveJitsiCall: no active Jitsi call")
return
}

Expand All @@ -257,65 +257,65 @@ class CallPresenter: NSObject {
self.jitsiVC = nil

guard let widget = jitsiVC.widget else {
NSLog("[CallPresenter] endActiveJitsiCall: no Jitsi widget for the active call")
MXLog.debug("[CallPresenter] endActiveJitsiCall: no Jitsi widget for the active call")
return
}
guard let uuid = self.jitsiCalls.first(where: { $0.value.widgetId == widget.widgetId })?.key else {
// this Jitsi call is not managed by this class
NSLog("[CallPresenter] endActiveJitsiCall: Not managed Jitsi call: \(widget.widgetId)")
MXLog.debug("[CallPresenter] endActiveJitsiCall: Not managed Jitsi call: \(widget.widgetId)")
return
}

let endCallAction = CXEndCallAction(call: uuid)
let transaction = CXTransaction(action: endCallAction)

NSLog("[CallPresenter] endActiveJitsiCall: ended call with id: \(uuid.uuidString)")
MXLog.debug("[CallPresenter] endActiveJitsiCall: ended call with id: \(uuid.uuidString)")

JMCallKitProxy.request(transaction) { (error) in
NSLog("[CallPresenter] endActiveJitsiCall: JMCallKitProxy returned \(String(describing: error))")
MXLog.debug("[CallPresenter] endActiveJitsiCall: JMCallKitProxy returned \(String(describing: error))")
if error == nil {
self.jitsiCalls.removeValue(forKey: uuid)
}
}
}

func processWidgetEvent(_ event: MXEvent, inSession session: MXSession) {
NSLog("[CallPresenter] processWidgetEvent")
MXLog.debug("[CallPresenter] processWidgetEvent")

guard JMCallKitProxy.isProviderConfigured() else {
// CallKit proxy is not configured, no benefit in parsing the event
NSLog("[CallPresenter] processWidgetEvent: JMCallKitProxy not configured")
MXLog.debug("[CallPresenter] processWidgetEvent: JMCallKitProxy not configured")
return
}

guard let widget = Widget(widgetEvent: event, inMatrixSession: session) else {
NSLog("[CallPresenter] processWidgetEvent: widget couldn't be created")
MXLog.debug("[CallPresenter] processWidgetEvent: widget couldn't be created")
return
}

if let uuid = self.jitsiCalls.first(where: { $0.value.widgetId == widget.widgetId })?.key {
// this Jitsi call is already managed by this class, no need to report the call again
NSLog("[CallPresenter] processWidgetEvent: Jitsi call already managed with id: \(uuid.uuidString)")
MXLog.debug("[CallPresenter] processWidgetEvent: Jitsi call already managed with id: \(uuid.uuidString)")
return
}

if widget.isActive {
guard widget.type == kWidgetTypeJitsiV1 || widget.type == kWidgetTypeJitsiV2 else {
// not a Jitsi widget, ignore
NSLog("[CallPresenter] processWidgetEvent: not a Jitsi widget")
MXLog.debug("[CallPresenter] processWidgetEvent: not a Jitsi widget")
return
}

if let jitsiVC = jitsiVC,
jitsiVC.widget.widgetId == widget.widgetId {
// this is already the Jitsi call we have atm
NSLog("[CallPresenter] processWidgetEvent: ongoing Jitsi call")
MXLog.debug("[CallPresenter] processWidgetEvent: ongoing Jitsi call")
return
}

if TimeInterval(event.age)/MSEC_PER_SEC > Constants.groupCallInviteLifetime {
// too late to process the event
NSLog("[CallPresenter] processWidgetEvent: expired call invite")
MXLog.debug("[CallPresenter] processWidgetEvent: expired call invite")
return
}

Expand All @@ -327,7 +327,7 @@ class CallPresenter: NSObject {

if event.sender == session.myUserId {
// outgoing call
NSLog("[CallPresenter] processWidgetEvent: Report outgoing call with id: \(newUUID.uuidString)")
MXLog.debug("[CallPresenter] processWidgetEvent: Report outgoing call with id: \(newUUID.uuidString)")
JMCallKitProxy.reportOutgoingCall(with: newUUID, connectedAt: nil)
} else {
// incoming call
Expand All @@ -339,13 +339,13 @@ class CallPresenter: NSObject {
let displayName = NSString.localizedUserNotificationString(forKey: "GROUP_CALL_FROM_USER",
arguments: [user?.displayname as Any])

NSLog("[CallPresenter] processWidgetEvent: Report new incoming call with id: \(newUUID.uuidString)")
MXLog.debug("[CallPresenter] processWidgetEvent: Report new incoming call with id: \(newUUID.uuidString)")

JMCallKitProxy.reportNewIncomingCall(UUID: newUUID,
handle: widget.roomId,
displayName: displayName,
hasVideo: true) { (error) in
NSLog("[CallPresenter] processWidgetEvent: JMCallKitProxy returned \(String(describing: error))")
MXLog.debug("[CallPresenter] processWidgetEvent: JMCallKitProxy returned \(String(describing: error))")

if error != nil {
self.jitsiCalls.removeValue(forKey: newUUID)
Expand All @@ -355,10 +355,10 @@ class CallPresenter: NSObject {
} else {
guard let uuid = self.jitsiCalls.first(where: { $0.value.widgetId == widget.widgetId })?.key else {
// this Jitsi call is not managed by this class
NSLog("[CallPresenter] processWidgetEvent: not managed Jitsi call: \(widget.widgetId)")
MXLog.debug("[CallPresenter] processWidgetEvent: not managed Jitsi call: \(widget.widgetId)")
return
}
NSLog("[CallPresenter] processWidgetEvent: ended call with id: \(uuid.uuidString)")
MXLog.debug("[CallPresenter] processWidgetEvent: ended call with id: \(uuid.uuidString)")
JMCallKitProxy.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
self.jitsiCalls.removeValue(forKey: uuid)
}
Expand Down Expand Up @@ -440,9 +440,9 @@ class CallPresenter: NSObject {

private func logCallVC(_ callVC: UIViewController, log: String) {
if let callVC = callVC as? CallViewController {
NSLog("[CallPresenter] \(log): Matrix call: \(String(describing: callVC.mxCall?.callId))")
MXLog.debug("[CallPresenter] \(log): Matrix call: \(String(describing: callVC.mxCall?.callId))")
} else if let callVC = callVC as? JitsiViewController {
NSLog("[CallPresenter] \(log): Jitsi call: \(callVC.widget.widgetId)")
MXLog.debug("[CallPresenter] \(log): Jitsi call: \(callVC.widget.widgetId)")
}
}

Expand Down Expand Up @@ -608,23 +608,23 @@ class CallPresenter: NSObject {

switch call.state {
case .createAnswer:
NSLog("[CallPresenter] callStateChanged: call created answer: \(call.callId)")
MXLog.debug("[CallPresenter] callStateChanged: call created answer: \(call.callId)")
if call.isIncoming, isCallKitEnabled, let callVC = callVCs[call.callId] {
presentCallVC(callVC)
}
case .connected:
NSLog("[CallPresenter] callStateChanged: call connected: \(call.callId)")
MXLog.debug("[CallPresenter] callStateChanged: call connected: \(call.callId)")
callTimer?.fire()
case .onHold:
NSLog("[CallPresenter] callStateChanged: call holded: \(call.callId)")
MXLog.debug("[CallPresenter] callStateChanged: call holded: \(call.callId)")
callTimer?.fire()
callHolded(withCallId: call.callId)
case .remotelyOnHold:
NSLog("[CallPresenter] callStateChanged: call remotely holded: \(call.callId)")
MXLog.debug("[CallPresenter] callStateChanged: call remotely holded: \(call.callId)")
callTimer?.fire()
callHolded(withCallId: call.callId)
case .ended:
NSLog("[CallPresenter] callStateChanged: call ended: \(call.callId)")
MXLog.debug("[CallPresenter] callStateChanged: call ended: \(call.callId)")
endCall(withCallId: call.callId)
default:
break
Expand All @@ -633,7 +633,7 @@ class CallPresenter: NSObject {

@objc
private func callTileTapped(_ notification: Notification) {
NSLog("[CallPresenter] callTileTapped")
MXLog.debug("[CallPresenter] callTileTapped")

guard let bubbleData = notification.object as? RoomBubbleCellData else {
return
Expand All @@ -647,7 +647,7 @@ class CallPresenter: NSObject {
return
}

NSLog("[CallPresenter] callTileTapped: for call: \(callEventContent.callId)")
MXLog.debug("[CallPresenter] callTileTapped: for call: \(callEventContent.callId)")

guard let session = sessions.first else { return }

Expand All @@ -672,7 +672,7 @@ class CallPresenter: NSObject {

@objc
private func groupCallTileTapped(_ notification: Notification) {
NSLog("[CallPresenter] groupCallTileTapped")
MXLog.debug("[CallPresenter] groupCallTileTapped")

guard let bubbleData = notification.object as? RoomBubbleCellData else {
return
Expand All @@ -694,7 +694,7 @@ class CallPresenter: NSObject {
return
}

NSLog("[CallPresenter] groupCallTileTapped: for call: \(widget.widgetId)")
MXLog.debug("[CallPresenter] groupCallTileTapped: for call: \(widget.widgetId)")

guard let jitsiVC = jitsiVC,
jitsiVC.widget.widgetId == widget.widgetId else {
Expand Down
Loading

0 comments on commit 0c98d01

Please sign in to comment.