From b6dee6da6a16a383ca1cac097719e5aebafd77b5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Nov 2021 17:05:32 +0100
Subject: [PATCH] reverse: webrtc: include oldState in onConnectionChange
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

turns out we don’t need it and a better way is for RtpConnection to keep track of *all*
states in the current generation
---
 .../conversations/xmpp/jingle/JingleRtpConnection.java |  4 ++--
 .../siacs/conversations/xmpp/jingle/WebRTCWrapper.java | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index ed1f35dd2..37c51bfdc 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -1338,8 +1338,8 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
     }
 
     @Override
-    public void onConnectionChange(final PeerConnection.PeerConnectionState oldState, final PeerConnection.PeerConnectionState newState) {
-        Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": PeerConnectionState changed: " + oldState + "->" + newState);
+    public void onConnectionChange(final PeerConnection.PeerConnectionState newState) {
+        Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": PeerConnectionState changed to" + newState);
         this.stateHistory.add(newState);
         if (newState == PeerConnection.PeerConnectionState.CONNECTED) {
             this.sessionDuration.start();
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
index c1201206a..5ee6c5d5e 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
@@ -88,7 +88,6 @@ public class WebRTCWrapper {
     private final Handler mainHandler = new Handler(Looper.getMainLooper());
     private VideoTrack localVideoTrack = null;
     private VideoTrack remoteVideoTrack = null;
-    private PeerConnection.PeerConnectionState currentState;
     private final PeerConnection.Observer peerConnectionObserver = new PeerConnection.Observer() {
         @Override
         public void onSignalingChange(PeerConnection.SignalingState signalingState) {
@@ -100,9 +99,7 @@ public class WebRTCWrapper {
 
         @Override
         public void onConnectionChange(final PeerConnection.PeerConnectionState newState) {
-            final PeerConnection.PeerConnectionState oldState = currentState;
-            currentState = newState;
-            eventCallback.onConnectionChange(oldState, newState);
+            eventCallback.onConnectionChange(newState);
         }
 
         @Override
@@ -154,6 +151,7 @@ public class WebRTCWrapper {
         @Override
         public void onRenegotiationNeeded() {
             Log.d(EXTENDED_LOGGING_TAG, "onRenegotiationNeeded()");
+            final PeerConnection.PeerConnectionState currentState = peerConnection == null ? null : peerConnection.connectionState();
             if (currentState != null && currentState != PeerConnection.PeerConnectionState.NEW) {
                 eventCallback.onRenegotiationNeeded();
             }
@@ -267,8 +265,6 @@ public class WebRTCWrapper {
             throw new InitializationException("Unable to create PeerConnection");
         }
 
-        this.currentState = peerConnection.connectionState();
-
         final Optional<CapturerChoice> optionalCapturerChoice = media.contains(Media.VIDEO) ? getVideoCapturer() : Optional.absent();
 
         if (optionalCapturerChoice.isPresent()) {
@@ -535,7 +531,7 @@ public class WebRTCWrapper {
     public interface EventCallback {
         void onIceCandidate(IceCandidate iceCandidate);
 
-        void onConnectionChange(PeerConnection.PeerConnectionState oldState, PeerConnection.PeerConnectionState newState);
+        void onConnectionChange(PeerConnection.PeerConnectionState newState);
 
         void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices);