From 8f96abb41ec7c350a09a3634fa826eefcbebec2b Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 5 Jun 2023 11:43:55 -0300 Subject: [PATCH] Update TAG usage throughout call link processors. --- .../webrtc/CallLinkConnectedActionProcessor.kt | 6 +++++- .../webrtc/CallLinkJoiningActionProcessor.kt | 6 +++++- .../webrtc/CallLinkPreJoinActionProcessor.kt | 2 +- .../webrtc/GroupConnectedActionProcessor.java | 10 +++++++--- .../webrtc/GroupJoiningActionProcessor.java | 6 +++++- .../webrtc/GroupPreJoinActionProcessor.java | 18 +++++++++++------- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkConnectedActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkConnectedActionProcessor.kt index f5ef567732..d61a08e9a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkConnectedActionProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkConnectedActionProcessor.kt @@ -14,7 +14,11 @@ import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState class CallLinkConnectedActionProcessor( actionProcessorFactory: MultiPeerActionProcessorFactory, webRtcInteractor: WebRtcInteractor -) : GroupConnectedActionProcessor(actionProcessorFactory, webRtcInteractor) { +) : GroupConnectedActionProcessor(actionProcessorFactory, webRtcInteractor, TAG) { + + companion object { + private val TAG = Log.tag(CallLinkConnectedActionProcessor::class.java) + } override fun handleGroupRequestUpdateMembers(currentState: WebRtcServiceState): WebRtcServiceState { Log.i(tag, "handleGroupRequestUpdateMembers():") diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkJoiningActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkJoiningActionProcessor.kt index f57a1d9ba4..6ffb8fd453 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkJoiningActionProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkJoiningActionProcessor.kt @@ -14,7 +14,11 @@ import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState class CallLinkJoiningActionProcessor( actionProcessorFactory: MultiPeerActionProcessorFactory, webRtcInteractor: WebRtcInteractor -) : GroupJoiningActionProcessor(actionProcessorFactory, webRtcInteractor) { +) : GroupJoiningActionProcessor(actionProcessorFactory, webRtcInteractor, TAG) { + + companion object { + private val TAG = Log.tag(CallLinkJoiningActionProcessor::class.java) + } override fun handleGroupRequestUpdateMembers(currentState: WebRtcServiceState): WebRtcServiceState { Log.i(tag, "handleGroupRequestUpdateMembers():") diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt index a91c9d5946..4507e36e3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt @@ -28,7 +28,7 @@ import java.io.IOException class CallLinkPreJoinActionProcessor( actionProcessorFactory: MultiPeerActionProcessorFactory, webRtcInteractor: WebRtcInteractor -) : GroupPreJoinActionProcessor(actionProcessorFactory, webRtcInteractor) { +) : GroupPreJoinActionProcessor(actionProcessorFactory, webRtcInteractor, TAG) { companion object { private val TAG = Log.tag(CallLinkPreJoinActionProcessor::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java index 671aba1be0..7ced09ad45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java @@ -35,7 +35,11 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor { private static final String TAG = Log.tag(GroupConnectedActionProcessor.class); public GroupConnectedActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor) { - super(actionProcessorFactory, webRtcInteractor, TAG); + this(actionProcessorFactory, webRtcInteractor, TAG); + } + + protected GroupConnectedActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor, @NonNull String tag) { + super(actionProcessorFactory, webRtcInteractor, tag); } @Override @@ -76,7 +80,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor { @Override protected @NonNull WebRtcServiceState handleSetEnableVideo(@NonNull WebRtcServiceState currentState, boolean enable) { - Log.i(TAG, "handleSetEnableVideo():"); + Log.i(tag, "handleSetEnableVideo():"); GroupCall groupCall = currentState.getCallInfoState().requireGroupCall(); Camera camera = currentState.getVideoState().requireCamera(); @@ -167,7 +171,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor { @Override protected @NonNull WebRtcServiceState handleLocalHangup(@NonNull WebRtcServiceState currentState) { - Log.i(TAG, "handleLocalHangup():"); + Log.i(tag, "handleLocalHangup():"); GroupCall groupCall = currentState.getCallInfoState().requireGroupCall(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java index c945d2dbae..d230187d9c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupJoiningActionProcessor.java @@ -26,7 +26,11 @@ public class GroupJoiningActionProcessor extends GroupActionProcessor { private static final String TAG = Log.tag(GroupJoiningActionProcessor.class); public GroupJoiningActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor) { - super(actionProcessorFactory, webRtcInteractor, TAG); + this(actionProcessorFactory, webRtcInteractor, TAG); + } + + protected GroupJoiningActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor, @NonNull String tag) { + super(actionProcessorFactory, webRtcInteractor, tag); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java index 4367b5c58f..b23f3ae372 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java @@ -34,12 +34,16 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { private static final String TAG = Log.tag(GroupPreJoinActionProcessor.class); public GroupPreJoinActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor) { - super(actionProcessorFactory, webRtcInteractor, TAG); + this(actionProcessorFactory, webRtcInteractor, TAG); + } + + protected GroupPreJoinActionProcessor(@NonNull MultiPeerActionProcessorFactory actionProcessorFactory, @NonNull WebRtcInteractor webRtcInteractor, @NonNull String tag) { + super(actionProcessorFactory, webRtcInteractor, tag); } @Override protected @NonNull WebRtcServiceState handlePreJoinCall(@NonNull WebRtcServiceState currentState, @NonNull RemotePeer remotePeer) { - Log.i(TAG, "handlePreJoinCall():"); + Log.i(tag, "handlePreJoinCall():"); byte[] groupId = currentState.getCallInfoState().getCallRecipient().requireGroupId().getDecodedId(); GroupCall groupCall = webRtcInteractor.getCallManager().createGroupCall(groupId, @@ -54,7 +58,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { groupCall.setOutgoingVideoMuted(true); groupCall.setDataMode(NetworkUtil.getCallingDataMode(context, groupCall.getLocalDeviceState().getNetworkRoute().getLocalAdapterType())); - Log.i(TAG, "Connecting to group call: " + currentState.getCallInfoState().getCallRecipient().getId()); + Log.i(tag, "Connecting to group call: " + currentState.getCallInfoState().getCallRecipient().getId()); groupCall.connect(); } catch (CallException e) { return groupCallFailure(currentState, "Unable to connect to group call", e); @@ -71,7 +75,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { @Override protected @NonNull WebRtcServiceState handleCancelPreJoinCall(@NonNull WebRtcServiceState currentState) { - Log.i(TAG, "handleCancelPreJoinCall():"); + Log.i(tag, "handleCancelPreJoinCall():"); GroupCall groupCall = currentState.getCallInfoState().requireGroupCall(); try { @@ -148,7 +152,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { @NonNull RemotePeer remotePeer, @NonNull OfferMessage.Type offerType) { - Log.i(TAG, "handleOutgoingCall():"); + Log.i(tag, "handleOutgoingCall():"); GroupCall groupCall = currentState.getCallInfoState().requireGroupCall(); @@ -181,7 +185,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { @Override protected @NonNull WebRtcServiceState handleSetEnableVideo(@NonNull WebRtcServiceState currentState, boolean enable) { - Log.i(TAG, "handleSetEnableVideo(): Changing for pre-join group call. enable: " + enable); + Log.i(tag, "handleSetEnableVideo(): Changing for pre-join group call. enable: " + enable); currentState.getVideoState().requireCamera().setEnabled(enable); return currentState.builder() @@ -195,7 +199,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor { @Override protected @NonNull WebRtcServiceState handleSetMuteAudio(@NonNull WebRtcServiceState currentState, boolean muted) { - Log.i(TAG, "handleSetMuteAudio(): Changing for pre-join group call. muted: " + muted); + Log.i(tag, "handleSetMuteAudio(): Changing for pre-join group call. muted: " + muted); return currentState.builder() .changeLocalDeviceState()