From b870b0f2089b8156374b816e4c213c1518e1c2f9 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 23 Apr 2024 15:26:00 +0200 Subject: [PATCH] rename classes called 'Magic*' Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/activities/BaseActivity.kt | 2 +- .../MentionAutocompleteCallback.java | 4 +-- .../com/nextcloud/talk/chat/ChatActivity.kt | 4 +-- .../talk/events/CertificateEvent.java | 2 +- .../{MagicCharPolicy.java => CharPolicy.java} | 4 +-- .../talk/webrtc/PeerConnectionWrapper.java | 29 +++++++++---------- ...ximitySensor.java => ProximitySensor.java} | 12 ++++---- .../nextcloud/talk/webrtc/WebRTCUtils.java | 2 +- .../talk/webrtc/WebRtcAudioManager.java | 4 +-- .../talk/webrtc/WebRtcBluetoothManager.java | 2 +- 10 files changed, 32 insertions(+), 33 deletions(-) rename app/src/main/java/com/nextcloud/talk/utils/{MagicCharPolicy.java => CharPolicy.java} (96%) rename app/src/main/java/com/nextcloud/talk/webrtc/{MagicProximitySensor.java => ProximitySensor.java} (92%) diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index c5b3549c8..6b7b37411 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -233,7 +233,7 @@ open class BaseActivity : AppCompatActivity() { @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(event: CertificateEvent) { - showCertificateDialog(event.x509Certificate, event.magicTrustManager, event.sslErrorHandler) + showCertificateDialog(event.x509Certificate, event.trustManager, event.sslErrorHandler) } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java index cf2e41e05..d6592782d 100644 --- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java +++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java @@ -17,7 +17,7 @@ import com.nextcloud.talk.data.user.model.User; import com.nextcloud.talk.models.json.mention.Mention; import com.nextcloud.talk.ui.theme.ViewThemeUtils; import com.nextcloud.talk.utils.DisplayUtils; -import com.nextcloud.talk.utils.MagicCharPolicy; +import com.nextcloud.talk.utils.CharPolicy; import com.nextcloud.talk.utils.text.Spans; import com.otaliastudios.autocomplete.AutocompleteCallback; import com.vanniktech.emoji.EmojiRange; @@ -47,7 +47,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback(binding.messageInputView.inputEditText) .with(elevation) .with(backgroundDrawable) - .with(MagicCharPolicy('@')) + .with(CharPolicy('@')) .with(presenter) .with(callback) .build() diff --git a/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java b/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java index 2c748f8c6..3e5954dc3 100644 --- a/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java @@ -36,7 +36,7 @@ public class CertificateEvent { return x509Certificate; } - public TrustManager getMagicTrustManager() { + public TrustManager getTrustManager() { return trustManager; } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java b/app/src/main/java/com/nextcloud/talk/utils/CharPolicy.java similarity index 96% rename from app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java rename to app/src/main/java/com/nextcloud/talk/utils/CharPolicy.java index 5d72f1e09..add1d48d7 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java +++ b/app/src/main/java/com/nextcloud/talk/utils/CharPolicy.java @@ -15,11 +15,11 @@ import com.otaliastudios.autocomplete.AutocompletePolicy; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class MagicCharPolicy implements AutocompletePolicy { +public class CharPolicy implements AutocompletePolicy { private final char character; - public MagicCharPolicy(char character) { + public CharPolicy(char character) { this.character = character; } diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java index 39a2a5dd4..fe44e797d 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java @@ -29,7 +29,6 @@ import org.webrtc.PeerConnection; import org.webrtc.PeerConnectionFactory; import org.webrtc.RtpReceiver; import org.webrtc.RtpTransceiver; -import org.webrtc.SdpObserver; import org.webrtc.SessionDescription; import org.webrtc.VideoTrack; @@ -68,7 +67,7 @@ public class PeerConnectionWrapper { private String sessionId; private final MediaConstraints mediaConstraints; private DataChannel dataChannel; - private final MagicSdpObserver magicSdpObserver; + private final SdpObserver sdpObserver; private final boolean hasInitiated; @@ -127,13 +126,13 @@ public class PeerConnectionWrapper { this.sessionId = sessionId; this.mediaConstraints = mediaConstraints; - magicSdpObserver = new MagicSdpObserver(); + sdpObserver = new SdpObserver(); hasInitiated = sessionId.compareTo(localSession) < 0; this.isMCUPublisher = isMCUPublisher; PeerConnection.RTCConfiguration configuration = new PeerConnection.RTCConfiguration(iceServerList); configuration.sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN; - peerConnection = peerConnectionFactory.createPeerConnection(configuration, new MagicPeerConnectionObserver()); + peerConnection = peerConnectionFactory.createPeerConnection(configuration, new InitialPeerConnectionObserver()); this.signalingMessageReceiver = signalingMessageReceiver; this.signalingMessageReceiver.addListener(webRtcMessageListener, sessionId, videoStreamType); @@ -155,9 +154,9 @@ public class PeerConnectionWrapper { DataChannel.Init init = new DataChannel.Init(); init.negotiated = false; dataChannel = peerConnection.createDataChannel("status", init); - dataChannel.registerObserver(new MagicDataChannelObserver()); + dataChannel.registerObserver(new DataChannelObserver()); if (isMCUPublisher) { - peerConnection.createOffer(magicSdpObserver, mediaConstraints); + peerConnection.createOffer(sdpObserver, mediaConstraints); } else if (hasMCU && "video".equals(this.videoStreamType)) { // If the connection type is "screen" the client sharing the screen will send an // offer; offers should be requested only for videos. @@ -168,7 +167,7 @@ public class PeerConnectionWrapper { } else if (!hasMCU && hasInitiated && "video".equals(this.videoStreamType)) { // If the connection type is "screen" the client sharing the screen will send an // offer; offers should be created only for videos. - peerConnection.createOffer(magicSdpObserver, mediaConstraints); + peerConnection.createOffer(sdpObserver, mediaConstraints); } } } @@ -358,7 +357,7 @@ public class PeerConnectionWrapper { sessionDescriptionStringWithPreferredCodec); if (getPeerConnection() != null) { - getPeerConnection().setRemoteDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec); + getPeerConnection().setRemoteDescription(sdpObserver, sessionDescriptionWithPreferredCodec); } } @@ -372,7 +371,7 @@ public class PeerConnectionWrapper { } } - private class MagicDataChannelObserver implements DataChannel.Observer { + private class DataChannelObserver implements DataChannel.Observer { @Override public void onBufferedAmountChange(long l) { @@ -451,7 +450,7 @@ public class PeerConnectionWrapper { } } - private class MagicPeerConnectionObserver implements PeerConnection.Observer { + private class InitialPeerConnectionObserver implements PeerConnection.Observer { @Override public void onSignalingChange(PeerConnection.SignalingState signalingState) { @@ -523,7 +522,7 @@ public class PeerConnectionWrapper { + " exists, but received onDataChannel event for DataChannel with label " + dataChannel.label()); } PeerConnectionWrapper.this.dataChannel = dataChannel; - PeerConnectionWrapper.this.dataChannel.registerObserver(new MagicDataChannelObserver()); + PeerConnectionWrapper.this.dataChannel.registerObserver(new DataChannelObserver()); } @Override @@ -536,8 +535,8 @@ public class PeerConnectionWrapper { } } - private class MagicSdpObserver implements SdpObserver { - private static final String TAG = "MagicSdpObserver"; + private class SdpObserver implements org.webrtc.SdpObserver { + private static final String TAG = "SdpObserver"; @Override public void onCreateFailure(String s) { @@ -573,7 +572,7 @@ public class PeerConnectionWrapper { signalingMessageSender.send(ncSignalingMessage); if (peerConnection != null) { - peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec); + peerConnection.setLocalDescription(sdpObserver, sessionDescriptionWithPreferredCodec); } } @@ -595,7 +594,7 @@ public class PeerConnectionWrapper { Passed 'MediaConstraints' will be ignored by WebRTC when using UNIFIED PLAN. See for details: https://docs.google.com/document/d/1PPHWV6108znP1tk_rkCnyagH9FK205hHeE9k5mhUzOg/edit#heading=h.9dcmkavg608r */ - peerConnection.createAnswer(magicSdpObserver, new MediaConstraints()); + peerConnection.createAnswer(sdpObserver, new MediaConstraints()); } diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java b/app/src/main/java/com/nextcloud/talk/webrtc/ProximitySensor.java similarity index 92% rename from app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java rename to app/src/main/java/com/nextcloud/talk/webrtc/ProximitySensor.java index 9ddc373f7..925f45996 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/ProximitySensor.java @@ -16,7 +16,7 @@ import android.util.Log; import org.webrtc.ThreadUtils; /** - * MagicProximitySensor manages functions related to the proximity sensor in + * ProximitySensor manages functions related to the proximity sensor in * the app. * On most device, the proximity sensor is implemented as a boolean-sensor. * It returns just two values "NEAR" or "FAR". Thresholding is done on the LUX @@ -24,8 +24,8 @@ import org.webrtc.ThreadUtils; * A LUX-value more than the threshold means the proximity sensor returns "FAR". * Anything less than the threshold value and the sensor returns "NEAR". */ -public class MagicProximitySensor implements SensorEventListener { - private static final String TAG = "MagicProximitySensor"; +public class ProximitySensor implements SensorEventListener { + private static final String TAG = "ProximitySensor"; // This class should be created, started and stopped on one thread // (e.g. the main thread). We use |nonThreadSafe| to ensure that this is @@ -37,7 +37,7 @@ public class MagicProximitySensor implements SensorEventListener { private Sensor proximitySensor = null; private boolean lastStateReportIsNear = false; - private MagicProximitySensor(Context context, Runnable sensorStateListener) { + private ProximitySensor(Context context, Runnable sensorStateListener) { onSensorStateListener = sensorStateListener; sensorManager = ((SensorManager) context.getSystemService(Context.SENSOR_SERVICE)); } @@ -45,8 +45,8 @@ public class MagicProximitySensor implements SensorEventListener { /** * Construction */ - static MagicProximitySensor create(Context context, Runnable sensorStateListener) { - return new MagicProximitySensor(context, sensorStateListener); + static ProximitySensor create(Context context, Runnable sensorStateListener) { + return new ProximitySensor(context, sensorStateListener); } /** diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java index 4cc27c543..2fe3bf956 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java @@ -25,7 +25,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class WebRTCUtils { - private static final String TAG = "MagicWebRTCUtils"; + private static final String TAG = "WebRTCUtils"; private static final Set HARDWARE_ACCELERATION_DEVICE_EXCLUDE_SET = new HashSet() {{ add("GT-I9100"); // Samsung Galaxy S2 diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java index f025f09aa..77c4d79d9 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java @@ -56,7 +56,7 @@ public class WebRtcAudioManager { private AudioDevice userSelectedAudioDevice; private AudioDevice currentAudioDevice; - private MagicProximitySensor proximitySensor = null; + private ProximitySensor proximitySensor = null; private Set audioDevices = new HashSet<>(); @@ -83,7 +83,7 @@ public class WebRtcAudioManager { // Create and initialize the proximity sensor. // Tablet devices (e.g. Nexus 7) does not support proximity sensors. // Note that, the sensor will not be active until start() has been called. - proximitySensor = MagicProximitySensor.create(context, new Runnable() { + proximitySensor = ProximitySensor.create(context, new Runnable() { // This method will be called each time a state change is detected. // Example: user holds his hand over the device (closer than ~5 cm), // or removes his hand from the device. diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java index a57827ef7..cd15ca2f7 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java @@ -107,7 +107,7 @@ public class WebRtcBluetoothManager { * is connected and enabled: * UNINITIALIZED --> HEADSET_UNAVAILABLE --> HEADSET_AVAILABLE --> * SCO_CONNECTING --> SCO_CONNECTED <==> audio is now routed via BT SCO. - * Note that the MagicAudioManager is also involved in driving this state + * Note that the AudioManager is also involved in driving this state * change. */ @SuppressLint("MissingPermission")