resolve merge

pedroSG94 · Oct 10, 2023 · c72bf5a · c72bf5a
2 parents 5ec35eb + 48d3206
commit c72bf5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rtspserver/src/main/AndroidManifest.xml b/rtspserver/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pedro.rtspserver" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/ServerClient.kt b/rtspserver/src/main/java/com/pedro/rtspserver/ServerClient.kt
@@ -85,10 +85,12 @@ open class ServerClient(
         } else if (request.method == Method.TEARDOWN) {
           Log.i(TAG, "Client disconnected")
           listener.onDisconnected(this)
+          connectCheckerRtsp.onDisconnectRtsp()
         }
       } catch (e: SocketException) { // Client has left
         Log.e(TAG, "Client disconnected", e)
         listener.onDisconnected(this)
+        connectCheckerRtsp.onConnectionFailedRtsp(e.message.toString())
         break
       } catch (e: Exception) {
         Log.e(TAG, "Unexpected error", e)