Adds additional dispose method to the MethodCallHandlerImpl

ened · ened · commit d23899f0cac8 · 2020-06-07T13:42:10.000+01:00
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
@@ -117,8 +117,9 @@ public void setSpeakerphoneOn(boolean on) {
   }
 
   private void stopListening() {
-    channel.setMethodCallHandler(null);
+    methodCallHandler.dispose();
     methodCallHandler = null;
+    channel.setMethodCallHandler(null);
 
     if (rtcAudioManager != null) {
       Log.d(TAG, "Stopping the audio manager...");
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java
@@ -115,6 +115,10 @@ interface AudioManager {
     this.audioManager = audioManager;
   }
 
+  void dispose() {
+    mPeerConnectionObservers.clear();
+  }
+
   private void ensureInitialized() {
     if (mFactory != null) {
       return;
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java b/android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
@@ -75,6 +75,7 @@ void close() {
 
   void dispose() {
     this.close();
+
     peerConnection.dispose();
     eventChannel.setStreamHandler(null);
   }

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,9 @@ public void setSpeakerphoneOn(boolean on) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private void stopListening() {`
`120`		`- channel.setMethodCallHandler(null);`
	`120`	`+ methodCallHandler.dispose();`
`121`	`121`	`methodCallHandler = null;`
	`122`	`+ channel.setMethodCallHandler(null);`
`122`	`123`
`123`	`124`	`if (rtcAudioManager != null) {`
`124`	`125`	`Log.d(TAG, "Stopping the audio manager...");`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ void close() {`
`75`	`75`
`76`	`76`	`void dispose() {`
`77`	`77`	`this.close();`
	`78`	`+`
`78`	`79`	`peerConnection.dispose();`
`79`	`80`	`eventChannel.setStreamHandler(null);`
`80`	`81`	`}`