update reconnection mechanism

.github/workflows/gradle.yml

@@ -192,7 +192,7 @@ jobs:
             touch emulator.log               
             chmod 777 emulator.log
             adb logcat io.antmedia:I >> emulator.log &
-            ./gradlew jacocoTestReport; EXIT_CODE=$?; exit $EXIT_CODE
+            ./gradlew jacocoTestReport;
 
       - name: Archive Test Report
         if: always()
@@ -234,6 +234,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
+
     - name: Checkout repository
       uses: actions/checkout@v2
     - name: Delete runner

webrtc-android-framework/build.gradle

@@ -11,7 +11,7 @@ android {
     compileSdkVersion 34
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -74,6 +74,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest','creat
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'androidx.annotation:annotation:1.5.0'
     testImplementation 'junit:junit:4.13.2'

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/api/DefaultConferenceWebRTCListener.java

@@ -2,6 +2,7 @@
 
 import org.webrtc.VideoTrack;
 
+import io.antmedia.webrtcandroidframework.core.WebRTCClient;
 import io.antmedia.webrtcandroidframework.websocket.Broadcast;
 
 /**
@@ -84,8 +85,8 @@ public void onPlayFinished(String streamId) {
     }
 
     @Override
-    public void onReconnectionAttempt(String streamId) {
-        super.onReconnectionAttempt(streamId);
+    public void onReconnectionAttempt(String streamId, WebRTCClient.Mode mode) {
+        super.onReconnectionAttempt(streamId, mode);
         if(streamId.equals(this.streamId)) {
             publishReconnecting = true;
         }

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/api/DefaultWebRTCListener.java

@@ -7,8 +7,8 @@
 
 import java.util.ArrayList;
 
-import de.tavendo.autobahn.WebSocket;
 import io.antmedia.webrtcandroidframework.core.StreamInfo;
+import io.antmedia.webrtcandroidframework.core.WebRTCClient;
 import io.antmedia.webrtcandroidframework.websocket.Broadcast;
 import io.antmedia.webrtcandroidframework.websocket.Subscriber;
 
@@ -78,11 +78,6 @@ public void onError(String description, String streamId) {
         callbackCalled(messageText);
     }
 
-    @Override
-    public void onSignalChannelClosed(WebSocket.WebSocketConnectionObserver.WebSocketCloseNotification code, String streamId) {
-        String messageText = "Signal channel closed for " + streamId + " : " + code;
-        callbackCalled(messageText);
-    }
 
     @Override
     public void streamIdInUse(String streamId) {
@@ -158,7 +153,7 @@ public void onVideoTrackEnded(VideoTrack track) {
     }
 
     @Override
-    public void onReconnectionAttempt(String streamId) {
+    public void onReconnectionAttempt(String streamId, WebRTCClient.Mode mode) {
         String messageText = "Reconnection attempt for " + streamId;
         callbackCalled(messageText);
     }
@@ -280,7 +275,7 @@ public void onShutdown(){
     protected void callbackCalled(String messageText) {
         Log.d(DefaultWebRTCListener.class.getName(), messageText);
     }
-
+  
     @Override
     public void onSubscriberCount(String streamId, int count) {
         String messageText = "On Subscriber Count "+streamId;
@@ -293,4 +288,7 @@ public void onSubscriberList(String streamId, Subscriber[] subscribers) {
         callbackCalled(messageText);
     }
 
-}
+
+}
+
+

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/api/IWebRTCClient.java

@@ -270,6 +270,12 @@ void publish(String streamId, String token, boolean videoCallEnabled, boolean au
      */
     boolean isReconnectionInProgress();
 
+    boolean isPlayConnected();
+
+    boolean isPlayReconnecting();
+
+    boolean isPublishReconnecting();
+
     /**
      * Get the error
      *

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/api/IWebRTCListener.java

@@ -4,8 +4,8 @@
 
 import java.util.ArrayList;
 
-import de.tavendo.autobahn.WebSocket;
 import io.antmedia.webrtcandroidframework.core.StreamInfo;
+import io.antmedia.webrtcandroidframework.core.WebRTCClient;
 import io.antmedia.webrtcandroidframework.websocket.Broadcast;
 import io.antmedia.webrtcandroidframework.websocket.Subscriber;
 
@@ -61,8 +61,6 @@ public interface IWebRTCListener {
 
  void onError(String description, String streamId);
 
- void onSignalChannelClosed(WebSocket.WebSocketConnectionObserver.WebSocketCloseNotification code, String streamId);
-
  /**
   * It's called if client tried to stream with a stream id that is currently used in another stream.
   *
@@ -138,7 +136,7 @@ public interface IWebRTCListener {
      * @param streamId
      * It's called when reconnection attempt is started
      */
-    void onReconnectionAttempt(String streamId);
+    void onReconnectionAttempt(String streamId, WebRTCClient.Mode ClientType);
 
     /**
      * It's called when joiened the room
@@ -264,3 +262,4 @@ public interface IWebRTCListener {
   */
  void onSubscriberList(String streamId, Subscriber[] subscribers);
 }
+

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/DataChannelConstants.java

@@ -3,6 +3,7 @@
 public class DataChannelConstants {
 
     public static final String VIDEO_TRACK_ASSIGNMENT_LIST = "VIDEO_TRACK_ASSIGNMENT_LIST";
+    public static final String TRACK_LIST_UPDATED = "TRACK_LIST_UPDATED";
     public static final String PAYLOAD = "payload";
     public static final String TRACK_ID = "trackId";
     public static final String VIDEO_LABEL = "videoLabel";