From f0d67f560e8124f2d4590abefc62686409d0d172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20K=C4=85kol?= Date: Mon, 20 May 2024 17:49:42 +0200 Subject: [PATCH 1/9] rename project source files from jellyfish to fishjam --- .github/workflows/build_lint_test.yaml | 2 +- .github/workflows/publish_docs.yaml | 2 +- .gitmodules | 2 +- {JellyfishClient => FishjamClient}/.gitignore | 0 .../build.gradle | 12 +- .../consumer-rules.pro | 0 {JellyfishClient => FishjamClient}/module.md | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../java/com/fishjam/client/FishjamClient.kt | 12 +- .../fishjam/client/FishjamClientInternal.kt | 15 +- .../fishjam/client/FishjamClientListener.kt | 14 +- .../com/fishjam/client/FishjamTrackContext.kt | 20 +- .../src/main/java/fishjam/PeerMessageKt.kt | 253 ++++ .../main/java/fishjam}/PeerNotifications.java | 1162 ++++++++--------- .../main/java/fishjam/PeerNotificationsKt.kt | 7 + .../org/membraneframework/rtc/Constants.kt | 0 .../membraneframework/rtc/CreateOptions.kt | 0 .../java/org/membraneframework/rtc/Encoder.kt | 0 .../rtc/InternalMembraneRTC.kt | 2 +- .../org/membraneframework/rtc/MembraneRTC.kt | 0 .../membraneframework/rtc/MembraneRTCError.kt | 0 .../rtc/MembraneRTCListener.kt | 0 .../rtc/PeerConnectionFactoryWrapper.kt | 0 .../rtc/PeerConnectionListener.kt | 0 .../rtc/PeerConnectionManager.kt | 0 .../rtc/RTCEngineCommunication.kt | 0 .../rtc/RTCEngineListener.kt | 0 .../membraneframework/rtc/SimulcastConfig.kt | 0 .../rtc/dagger/MembraneRTCComponent.kt | 0 .../membraneframework/rtc/dagger/RTCModule.kt | 0 .../org/membraneframework/rtc/events/Event.kt | 0 .../membraneframework/rtc/media/AudioTrack.kt | 0 .../rtc/media/LocalAudioTrack.kt | 0 .../rtc/media/LocalScreencastTrack.kt | 0 .../membraneframework/rtc/media/LocalTrack.kt | 0 .../rtc/media/LocalVideoTrack.kt | 0 .../rtc/media/MediaTrackProvider.kt | 0 .../rtc/media/OnSoundDetectedListener.kt | 0 .../rtc/media/RemoteAudioTrack.kt | 0 .../rtc/media/RemoteTrack.kt | 0 .../rtc/media/RemoteVideoTrack.kt | 0 .../SimulcastVideoEncoderFactoryWrapper.kt | 0 .../rtc/media/SoundDetection.kt | 0 .../rtc/media/TrackBandwidthLimit.kt | 0 .../rtc/media/VideoParameters.kt | 0 .../membraneframework/rtc/media/VideoTrack.kt | 0 .../rtc/media/screencast/ScreencastService.kt | 0 .../screencast/ScreencastServiceConnector.kt | 0 .../rtc/models/EncodingReason.kt | 0 .../membraneframework/rtc/models/Endpoint.kt | 0 .../membraneframework/rtc/models/RTCStats.kt | 0 .../rtc/models/TrackContext.kt | 0 .../membraneframework/rtc/models/TrackData.kt | 0 .../membraneframework/rtc/models/VadStatus.kt | 0 .../rtc/transport/PhoenixTransport.kt | 0 .../rtc/ui/VideoTextureViewRenderer.kt | 0 .../rtc/utils/ClosableCoroutineScope.kt | 0 .../rtc/utils/EndpointConnectionUtils.kt | 0 .../rtc/utils/SuspendableSdpObserver.kt | 0 .../rtc/utils/TimberDebugTree.kt | 0 .../org/membraneframework/rtc/utils/types.kt | 0 .../java/fishjam/client/FishjamClientTest.kt | 51 +- .../java/fishjam/client}/WebsocketMock.kt | 8 +- .../rtc/test/EndpointConnectionManagerTest.kt | 0 .../src/main/java/jellyfish/PeerMessageKt.kt | 239 ---- .../java/jellyfish/PeerNotificationsKt.kt | 0 README.md | 2 +- app/build.gradle | 6 +- app/src/main/AndroidManifest.xml | 6 +- .../MainActivity.kt | 6 +- .../Participant.kt | 2 +- .../ParticipantVideoView.kt | 2 +- .../RoomActivity.kt | 6 +- .../RoomViewModel.kt | 16 +- .../ui/theme/Color.kt | 2 +- .../ui/theme/Theme.kt | 4 +- .../ui/theme/Type.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 3 +- compile_proto.sh | 4 +- settings.gradle | 4 +- 82 files changed, 876 insertions(+), 992 deletions(-) rename {JellyfishClient => FishjamClient}/.gitignore (100%) rename {JellyfishClient => FishjamClient}/build.gradle (89%) rename {JellyfishClient => FishjamClient}/consumer-rules.pro (100%) rename {JellyfishClient => FishjamClient}/module.md (100%) rename {JellyfishClient => FishjamClient}/proguard-rules.pro (100%) rename {JellyfishClient => FishjamClient}/src/main/AndroidManifest.xml (100%) rename JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClient.kt => FishjamClient/src/main/java/com/fishjam/client/FishjamClient.kt (95%) rename JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientInternal.kt => FishjamClient/src/main/java/com/fishjam/client/FishjamClientInternal.kt (92%) rename JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientListener.kt => FishjamClient/src/main/java/com/fishjam/client/FishjamClientListener.kt (82%) rename JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishTrackContext.kt => FishjamClient/src/main/java/com/fishjam/client/FishjamTrackContext.kt (67%) create mode 100644 FishjamClient/src/main/java/fishjam/PeerMessageKt.kt rename {JellyfishClient/src/main/java/jellyfish => FishjamClient/src/main/java/fishjam}/PeerNotifications.java (59%) create mode 100644 FishjamClient/src/main/java/fishjam/PeerNotificationsKt.kt rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/Constants.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/CreateOptions.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/Encoder.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt (99%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/MembraneRTC.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/MembraneRTCError.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/MembraneRTCListener.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/PeerConnectionFactoryWrapper.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/PeerConnectionListener.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/PeerConnectionManager.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/dagger/MembraneRTCComponent.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/dagger/RTCModule.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/events/Event.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/AudioTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/LocalAudioTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/LocalScreencastTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/LocalTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/LocalVideoTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/MediaTrackProvider.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/OnSoundDetectedListener.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/RemoteAudioTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/RemoteTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/RemoteVideoTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/SimulcastVideoEncoderFactoryWrapper.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/SoundDetection.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/TrackBandwidthLimit.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/VideoParameters.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/VideoTrack.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastService.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastServiceConnector.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/EncodingReason.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/Endpoint.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/RTCStats.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/TrackContext.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/TrackData.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/models/VadStatus.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/transport/PhoenixTransport.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/ui/VideoTextureViewRenderer.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/utils/ClosableCoroutineScope.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/utils/EndpointConnectionUtils.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/utils/SuspendableSdpObserver.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/utils/TimberDebugTree.kt (100%) rename {JellyfishClient => FishjamClient}/src/main/java/org/membraneframework/rtc/utils/types.kt (100%) rename JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/JellyfishClientTest.kt => FishjamClient/src/test/java/fishjam/client/FishjamClientTest.kt (57%) rename {JellyfishClient/src/test/java/jellyfishdev/jellyfishclient => FishjamClient/src/test/java/fishjam/client}/WebsocketMock.kt (88%) rename {JellyfishClient => FishjamClient}/src/test/java/org/membraneframework/rtc/test/EndpointConnectionManagerTest.kt (100%) delete mode 100644 JellyfishClient/src/main/java/jellyfish/PeerMessageKt.kt delete mode 100644 JellyfishClient/src/main/java/jellyfish/PeerNotificationsKt.kt rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/MainActivity.kt (97%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/Participant.kt (75%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/ParticipantVideoView.kt (98%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/RoomActivity.kt (96%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/RoomViewModel.kt (90%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/ui/theme/Color.kt (82%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/ui/theme/Theme.kt (96%) rename app/src/main/java/com/example/{jellyfishandroidexample => fishjamandroidexample}/ui/theme/Type.kt (94%) diff --git a/.github/workflows/build_lint_test.yaml b/.github/workflows/build_lint_test.yaml index b29a427..37980b8 100644 --- a/.github/workflows/build_lint_test.yaml +++ b/.github/workflows/build_lint_test.yaml @@ -21,4 +21,4 @@ jobs: run: ./gradlew assembleRelease - name: Test - run: ./gradlew :JellyfishClient:testDebugUnitTest \ No newline at end of file + run: ./gradlew :FishjamClient:testDebugUnitTest \ No newline at end of file diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 2059788..aa9c2e2 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -24,5 +24,5 @@ jobs: env: REPO: self BRANCH: gh-pages - FOLDER: JellyfishClient/build/dokka/html + FOLDER: FishjamClient/build/dokka/html GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitmodules b/.gitmodules index 30e453a..70f4b46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "protos"] path = protos - url = git@github.com:jellyfish-dev/protos.git + url = git@github.com:fishjam-dev/protos.git diff --git a/JellyfishClient/.gitignore b/FishjamClient/.gitignore similarity index 100% rename from JellyfishClient/.gitignore rename to FishjamClient/.gitignore diff --git a/JellyfishClient/build.gradle b/FishjamClient/build.gradle similarity index 89% rename from JellyfishClient/build.gradle rename to FishjamClient/build.gradle index 1b5c335..8d6f41c 100644 --- a/JellyfishClient/build.gradle +++ b/FishjamClient/build.gradle @@ -2,14 +2,14 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' id "org.jetbrains.dokka" - id "com.google.protobuf" version "0.9.3" + id "com.google.protobuf" version "0.9.4" id 'maven-publish' id "kotlin-android" } android { - namespace 'com.jellyfishdev.jellyfishclient' + namespace 'com.fishjam.client' compileSdk 33 defaultConfig { @@ -45,8 +45,8 @@ afterEvaluate { // Creates a Maven publication called "release". release(MavenPublication) { from components.release - groupId = 'com.jellyfishdev.jellyfishclient' - artifactId = 'jellyfish-android-client' + groupId = 'com.fishjam.client' + artifactId = 'fishjam-android-client' version = '0.1.0' } } @@ -61,7 +61,7 @@ afterEvaluate { } tasks.named("dokkaHtml") { - moduleName.set("JellyfishClient") + moduleName.set("FishjamClient") dokkaSourceSets { named("main") { includes.from("module.md") @@ -84,7 +84,7 @@ dependencies { implementation 'com.google.android.material:material:1.9.0' implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.jakewharton.timber:timber:5.0.1' - implementation 'com.google.protobuf:protobuf-kotlin:3.23.1' + implementation 'com.google.protobuf:protobuf-kotlin:4.26.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/JellyfishClient/consumer-rules.pro b/FishjamClient/consumer-rules.pro similarity index 100% rename from JellyfishClient/consumer-rules.pro rename to FishjamClient/consumer-rules.pro diff --git a/JellyfishClient/module.md b/FishjamClient/module.md similarity index 100% rename from JellyfishClient/module.md rename to FishjamClient/module.md diff --git a/JellyfishClient/proguard-rules.pro b/FishjamClient/proguard-rules.pro similarity index 100% rename from JellyfishClient/proguard-rules.pro rename to FishjamClient/proguard-rules.pro diff --git a/JellyfishClient/src/main/AndroidManifest.xml b/FishjamClient/src/main/AndroidManifest.xml similarity index 100% rename from JellyfishClient/src/main/AndroidManifest.xml rename to FishjamClient/src/main/AndroidManifest.xml diff --git a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClient.kt b/FishjamClient/src/main/java/com/fishjam/client/FishjamClient.kt similarity index 95% rename from JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClient.kt rename to FishjamClient/src/main/java/com/fishjam/client/FishjamClient.kt index 5b1df05..8846935 100644 --- a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClient.kt +++ b/FishjamClient/src/main/java/com/fishjam/client/FishjamClient.kt @@ -1,4 +1,4 @@ -package com.jellyfishdev.jellyfishclient +package com.fishjam.client import android.content.Context import android.content.Intent @@ -12,15 +12,15 @@ import org.membraneframework.rtc.models.RTCStats import org.membraneframework.rtc.utils.Metadata import org.webrtc.Logging -typealias TrackContext = JellyfishTrackContext +typealias TrackContext = FishjamTrackContext data class Config( val websocketUrl: String, val token: String, ) -class JellyfishClient(appContext: Context, listener: JellyfishClientListener) { - private val client = JellyfishClientInternal(appContext, listener) +class FishjamClient(appContext: Context, listener: FishjamClientListener) { + private val client = FishjamClientInternal(appContext, listener) /** * Connects to the server using the WebSocket connection @@ -41,8 +41,8 @@ class JellyfishClient(appContext: Context, listener: JellyfishClientListener) { } /** - * Tries to join the room. If user is accepted then {@link JellyfishClient.onConnected} will be called. - * In other case {@link JellyfishClient.onConnectError} is invoked. + * Tries to join the room. If user is accepted then {@link FishjamClient.onConnected} will be called. + * In other case {@link FishjamClient.onConnectError} is invoked. * * @param peerMetadata - Any information that other peers will receive in onPeerJoined * after accepting this peer diff --git a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientInternal.kt b/FishjamClient/src/main/java/com/fishjam/client/FishjamClientInternal.kt similarity index 92% rename from JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientInternal.kt rename to FishjamClient/src/main/java/com/fishjam/client/FishjamClientInternal.kt index f462dc1..7f9d87f 100644 --- a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientInternal.kt +++ b/FishjamClient/src/main/java/com/fishjam/client/FishjamClientInternal.kt @@ -1,8 +1,9 @@ -package com.jellyfishdev.jellyfishclient +package com.fishjam.client import android.content.Context -import jellyfish.PeerNotifications.PeerMessage -import jellyfish.PeerNotifications.PeerMessage.MediaEvent +import fishjam.PeerNotifications +import fishjam.PeerNotifications.PeerMessage + import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -20,9 +21,9 @@ import timber.log.Timber typealias Peer = Endpoint -internal class JellyfishClientInternal( +internal class FishjamClientInternal( appContext: Context, - private val listener: JellyfishClientListener, + private val listener: FishjamClientListener, ) : MembraneRTCListener { private var webSocket: WebSocket? = null @@ -60,7 +61,7 @@ internal class JellyfishClientInternal( override fun onOpen(webSocket: WebSocket, response: Response) { listener.onSocketOpen() - val authRequest = PeerMessage + val authRequest = PeerNotifications.PeerMessage .newBuilder() .setAuthRequest(PeerMessage.AuthRequest.newBuilder().setToken(config.token)) .build() @@ -110,7 +111,7 @@ internal class JellyfishClientInternal( override fun onSendMediaEvent(event: SerializedMediaEvent) { val mediaEvent = PeerMessage .newBuilder() - .setMediaEvent(MediaEvent.newBuilder().setData(event)) + .setMediaEvent(PeerMessage.MediaEvent.newBuilder().setData(event)) .build() sendEvent(mediaEvent) } diff --git a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientListener.kt b/FishjamClient/src/main/java/com/fishjam/client/FishjamClientListener.kt similarity index 82% rename from JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientListener.kt rename to FishjamClient/src/main/java/com/fishjam/client/FishjamClientListener.kt index 9b5551a..cd5bd93 100644 --- a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishClientListener.kt +++ b/FishjamClient/src/main/java/com/fishjam/client/FishjamClientListener.kt @@ -1,9 +1,9 @@ -package com.jellyfishdev.jellyfishclient +package com.fishjam.client import okhttp3.Response import timber.log.Timber -interface JellyfishClientListener { +interface FishjamClientListener { /** * Emitted when the websocket connection is closed */ @@ -36,12 +36,12 @@ interface JellyfishClientListener { fun onAuthError() /** - * Emitted when local user is connected to jellyfish. + * Emitted when local user is connected to fishjam. */ fun onJoined(peerID: String, peersInRoom: List) /** - * Emitted when there was an error while connecting to the jellyfish. + * Emitted when there was an error while connecting to the fishjam. */ fun onJoinError(metadata: Any) @@ -70,14 +70,14 @@ interface JellyfishClientListener { /** * Called when data in a new track arrives. * - * This callback is always called after {@link JellyfishClientListener.onTrackAdded}. + * This callback is always called after {@link FishjamClientListener.onTrackAdded}. * It informs user that data related to the given track arrives and can be played or displayed. */ fun onTrackReady(ctx: TrackContext) /** * Called each time the peer which was already in the room, adds new track. Fields track and stream will be set to null. - * These fields will be set to non-null value in {@link JellyfishClientListener.onTrackReady} + * These fields will be set to non-null value in {@link FishjamClientListener.onTrackReady} */ fun onTrackAdded(ctx: TrackContext) { Timber.i("Track ${ctx.trackId} added") @@ -86,7 +86,7 @@ interface JellyfishClientListener { /** * Called when some track will no longer be sent. * - * It will also be called before {@link JellyfishClientListener.onPeerLeft} for each track of this peer. + * It will also be called before {@link FishjamClientListener.onPeerLeft} for each track of this peer. */ fun onTrackRemoved(ctx: TrackContext) diff --git a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishTrackContext.kt b/FishjamClient/src/main/java/com/fishjam/client/FishjamTrackContext.kt similarity index 67% rename from JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishTrackContext.kt rename to FishjamClient/src/main/java/com/fishjam/client/FishjamTrackContext.kt index cf4db18..a59206a 100644 --- a/JellyfishClient/src/main/java/com/jellyfishdev/jellyfishclient/JellyfishTrackContext.kt +++ b/FishjamClient/src/main/java/com/fishjam/client/FishjamTrackContext.kt @@ -1,4 +1,4 @@ -package com.jellyfishdev.jellyfishclient +package com.fishjam.client import org.membraneframework.rtc.TrackEncoding import org.membraneframework.rtc.media.RemoteTrack @@ -9,15 +9,15 @@ import org.membraneframework.rtc.models.TrackContext import org.membraneframework.rtc.models.VadStatus import org.membraneframework.rtc.utils.Metadata -fun interface JellyfishOnVoiceActivityChangedListener { - fun onVoiceActivityChanged(trackContext: JellyfishTrackContext) +fun interface FishjamOnVoiceActivityChangedListener { + fun onVoiceActivityChanged(trackContext: FishjamTrackContext) } -fun interface JellyfishOnEncodingChangedListener { - fun onEncodingChangedListener(trackContext: JellyfishTrackContext) +fun interface FishjamOnEncodingChangedListener { + fun onEncodingChangedListener(trackContext: FishjamTrackContext) } -class JellyfishTrackContext(private val trackContext: TrackContext) { +class FishjamTrackContext(private val trackContext: TrackContext) { val track: RemoteTrack? get() { return trackContext.track @@ -53,13 +53,13 @@ class JellyfishTrackContext(private val trackContext: TrackContext) { return trackContext.encodingReason } - fun setOnEncodingChangedListener(listener: JellyfishOnEncodingChangedListener) { - val rtcListener = OnEncodingChangedListener { trackContext -> listener.onEncodingChangedListener(JellyfishTrackContext(trackContext)) } + fun setOnEncodingChangedListener(listener: FishjamOnEncodingChangedListener) { + val rtcListener = OnEncodingChangedListener { trackContext -> listener.onEncodingChangedListener(FishjamTrackContext(trackContext)) } trackContext.setOnEncodingChangedListener(rtcListener) } - fun setOnVoiceActivityChangedListener(listener: JellyfishOnVoiceActivityChangedListener) { - val rtcListener = OnVoiceActivityChangedListener { trackContext -> listener.onVoiceActivityChanged(JellyfishTrackContext(trackContext)) } + fun setOnVoiceActivityChangedListener(listener: FishjamOnVoiceActivityChangedListener) { + val rtcListener = OnVoiceActivityChangedListener { trackContext -> listener.onVoiceActivityChanged(FishjamTrackContext(trackContext)) } trackContext.setOnVoiceActivityChangedListener(rtcListener) } } diff --git a/FishjamClient/src/main/java/fishjam/PeerMessageKt.kt b/FishjamClient/src/main/java/fishjam/PeerMessageKt.kt new file mode 100644 index 0000000..80d2ee8 --- /dev/null +++ b/FishjamClient/src/main/java/fishjam/PeerMessageKt.kt @@ -0,0 +1,253 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: fishjam/peer_notifications.proto + +// Generated files should ignore deprecation warnings +@file:Suppress("DEPRECATION") +package fishjam; + +@kotlin.jvm.JvmName("-initializepeerMessage") +public inline fun peerMessage(block: fishjam.PeerMessageKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage = + fishjam.PeerMessageKt.Dsl._create(fishjam.PeerNotifications.PeerMessage.newBuilder()).apply { block() }._build() +/** + * ``` + * Defines any type of message sent between FJ and a peer + * ``` + * + * Protobuf type `fishjam.PeerMessage` + */ +public object PeerMessageKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + public class Dsl private constructor( + private val _builder: fishjam.PeerNotifications.PeerMessage.Builder + ) { + public companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: fishjam.PeerNotifications.PeerMessage.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): fishjam.PeerNotifications.PeerMessage = _builder.build() + + /** + * `.fishjam.PeerMessage.Authenticated authenticated = 1;` + */ + public var authenticated: fishjam.PeerNotifications.PeerMessage.Authenticated + @JvmName("getAuthenticated") + get() = _builder.getAuthenticated() + @JvmName("setAuthenticated") + set(value) { + _builder.setAuthenticated(value) + } + /** + * `.fishjam.PeerMessage.Authenticated authenticated = 1;` + */ + public fun clearAuthenticated() { + _builder.clearAuthenticated() + } + /** + * `.fishjam.PeerMessage.Authenticated authenticated = 1;` + * @return Whether the authenticated field is set. + */ + public fun hasAuthenticated(): kotlin.Boolean { + return _builder.hasAuthenticated() + } + + /** + * `.fishjam.PeerMessage.AuthRequest auth_request = 2;` + */ + public var authRequest: fishjam.PeerNotifications.PeerMessage.AuthRequest + @JvmName("getAuthRequest") + get() = _builder.getAuthRequest() + @JvmName("setAuthRequest") + set(value) { + _builder.setAuthRequest(value) + } + /** + * `.fishjam.PeerMessage.AuthRequest auth_request = 2;` + */ + public fun clearAuthRequest() { + _builder.clearAuthRequest() + } + /** + * `.fishjam.PeerMessage.AuthRequest auth_request = 2;` + * @return Whether the authRequest field is set. + */ + public fun hasAuthRequest(): kotlin.Boolean { + return _builder.hasAuthRequest() + } + + /** + * `.fishjam.PeerMessage.MediaEvent media_event = 3;` + */ + public var mediaEvent: fishjam.PeerNotifications.PeerMessage.MediaEvent + @JvmName("getMediaEvent") + get() = _builder.getMediaEvent() + @JvmName("setMediaEvent") + set(value) { + _builder.setMediaEvent(value) + } + /** + * `.fishjam.PeerMessage.MediaEvent media_event = 3;` + */ + public fun clearMediaEvent() { + _builder.clearMediaEvent() + } + /** + * `.fishjam.PeerMessage.MediaEvent media_event = 3;` + * @return Whether the mediaEvent field is set. + */ + public fun hasMediaEvent(): kotlin.Boolean { + return _builder.hasMediaEvent() + } + public val contentCase: fishjam.PeerNotifications.PeerMessage.ContentCase + @JvmName("getContentCase") + get() = _builder.getContentCase() + + public fun clearContent() { + _builder.clearContent() + } + } + @kotlin.jvm.JvmName("-initializeauthenticated") + public inline fun authenticated(block: fishjam.PeerMessageKt.AuthenticatedKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.Authenticated = + fishjam.PeerMessageKt.AuthenticatedKt.Dsl._create(fishjam.PeerNotifications.PeerMessage.Authenticated.newBuilder()).apply { block() }._build() + /** + * ``` + * Response sent by FJ, confirming successfull authentication + * ``` + * + * Protobuf type `fishjam.PeerMessage.Authenticated` + */ + public object AuthenticatedKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + public class Dsl private constructor( + private val _builder: fishjam.PeerNotifications.PeerMessage.Authenticated.Builder + ) { + public companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: fishjam.PeerNotifications.PeerMessage.Authenticated.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): fishjam.PeerNotifications.PeerMessage.Authenticated = _builder.build() + } + } + @kotlin.jvm.JvmName("-initializeauthRequest") + public inline fun authRequest(block: fishjam.PeerMessageKt.AuthRequestKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.AuthRequest = + fishjam.PeerMessageKt.AuthRequestKt.Dsl._create(fishjam.PeerNotifications.PeerMessage.AuthRequest.newBuilder()).apply { block() }._build() + /** + * ``` + * Request sent by peer, to authenticate to FJ server + * ``` + * + * Protobuf type `fishjam.PeerMessage.AuthRequest` + */ + public object AuthRequestKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + public class Dsl private constructor( + private val _builder: fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder + ) { + public companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): fishjam.PeerNotifications.PeerMessage.AuthRequest = _builder.build() + + /** + * `string token = 1;` + */ + public var token: kotlin.String + @JvmName("getToken") + get() = _builder.getToken() + @JvmName("setToken") + set(value) { + _builder.setToken(value) + } + /** + * `string token = 1;` + */ + public fun clearToken() { + _builder.clearToken() + } + } + } + @kotlin.jvm.JvmName("-initializemediaEvent") + public inline fun mediaEvent(block: fishjam.PeerMessageKt.MediaEventKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.MediaEvent = + fishjam.PeerMessageKt.MediaEventKt.Dsl._create(fishjam.PeerNotifications.PeerMessage.MediaEvent.newBuilder()).apply { block() }._build() + /** + * ``` + * Any type of WebRTC messages passed betweend FJ and peer + * ``` + * + * Protobuf type `fishjam.PeerMessage.MediaEvent` + */ + public object MediaEventKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + public class Dsl private constructor( + private val _builder: fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder + ) { + public companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): fishjam.PeerNotifications.PeerMessage.MediaEvent = _builder.build() + + /** + * `string data = 1;` + */ + public var data: kotlin.String + @JvmName("getData") + get() = _builder.getData() + @JvmName("setData") + set(value) { + _builder.setData(value) + } + /** + * `string data = 1;` + */ + public fun clearData() { + _builder.clearData() + } + } + } +} +@kotlin.jvm.JvmSynthetic +public inline fun fishjam.PeerNotifications.PeerMessage.copy(block: `fishjam`.PeerMessageKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage = + `fishjam`.PeerMessageKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +@kotlin.jvm.JvmSynthetic +public inline fun fishjam.PeerNotifications.PeerMessage.Authenticated.copy(block: `fishjam`.PeerMessageKt.AuthenticatedKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.Authenticated = + `fishjam`.PeerMessageKt.AuthenticatedKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +@kotlin.jvm.JvmSynthetic +public inline fun fishjam.PeerNotifications.PeerMessage.AuthRequest.copy(block: `fishjam`.PeerMessageKt.AuthRequestKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.AuthRequest = + `fishjam`.PeerMessageKt.AuthRequestKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +@kotlin.jvm.JvmSynthetic +public inline fun fishjam.PeerNotifications.PeerMessage.MediaEvent.copy(block: `fishjam`.PeerMessageKt.MediaEventKt.Dsl.() -> kotlin.Unit): fishjam.PeerNotifications.PeerMessage.MediaEvent = + `fishjam`.PeerMessageKt.MediaEventKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +public val fishjam.PeerNotifications.PeerMessageOrBuilder.authenticatedOrNull: fishjam.PeerNotifications.PeerMessage.Authenticated? + get() = if (hasAuthenticated()) getAuthenticated() else null + +public val fishjam.PeerNotifications.PeerMessageOrBuilder.authRequestOrNull: fishjam.PeerNotifications.PeerMessage.AuthRequest? + get() = if (hasAuthRequest()) getAuthRequest() else null + +public val fishjam.PeerNotifications.PeerMessageOrBuilder.mediaEventOrNull: fishjam.PeerNotifications.PeerMessage.MediaEvent? + get() = if (hasMediaEvent()) getMediaEvent() else null + diff --git a/JellyfishClient/src/main/java/jellyfish/PeerNotifications.java b/FishjamClient/src/main/java/fishjam/PeerNotifications.java similarity index 59% rename from JellyfishClient/src/main/java/jellyfish/PeerNotifications.java rename to FishjamClient/src/main/java/fishjam/PeerNotifications.java index 2372746..ed100e8 100644 --- a/JellyfishClient/src/main/java/jellyfish/PeerNotifications.java +++ b/FishjamClient/src/main/java/fishjam/PeerNotifications.java @@ -1,10 +1,20 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: jellyfish/peer_notifications.proto +// source: fishjam/peer_notifications.proto +// Protobuf Java Version: 4.26.1 -package jellyfish; +package fishjam; public final class PeerNotifications { private PeerNotifications() {} + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + PeerNotifications.class.getName()); + } public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -15,138 +25,140 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } public interface PeerMessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:jellyfish.PeerMessage) + // @@protoc_insertion_point(interface_extends:fishjam.PeerMessage) com.google.protobuf.MessageOrBuilder { /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return Whether the authenticated field is set. */ boolean hasAuthenticated(); /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return The authenticated. */ - jellyfish.PeerNotifications.PeerMessage.Authenticated getAuthenticated(); + fishjam.PeerNotifications.PeerMessage.Authenticated getAuthenticated(); /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ - jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder(); + fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder(); /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return Whether the authRequest field is set. */ boolean hasAuthRequest(); /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return The authRequest. */ - jellyfish.PeerNotifications.PeerMessage.AuthRequest getAuthRequest(); + fishjam.PeerNotifications.PeerMessage.AuthRequest getAuthRequest(); /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ - jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder(); + fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder(); /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return Whether the mediaEvent field is set. */ boolean hasMediaEvent(); /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return The mediaEvent. */ - jellyfish.PeerNotifications.PeerMessage.MediaEvent getMediaEvent(); + fishjam.PeerNotifications.PeerMessage.MediaEvent getMediaEvent(); /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ - jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder(); + fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder(); - public jellyfish.PeerNotifications.PeerMessage.ContentCase getContentCase(); + fishjam.PeerNotifications.PeerMessage.ContentCase getContentCase(); } /** - * Protobuf type {@code jellyfish.PeerMessage} + * 
+   * Defines any type of message sent between FJ and a peer
+   *
+ * + * Protobuf type {@code fishjam.PeerMessage} */ public static final class PeerMessage extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:jellyfish.PeerMessage) + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:fishjam.PeerMessage) PeerMessageOrBuilder { private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + PeerMessage.class.getName()); + } // Use PeerMessage.newBuilder() to construct. - private PeerMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private PeerMessage(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private PeerMessage() { } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new PeerMessage(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.class, jellyfish.PeerNotifications.PeerMessage.Builder.class); + fishjam.PeerNotifications.PeerMessage.class, fishjam.PeerNotifications.PeerMessage.Builder.class); } public interface AuthenticatedOrBuilder extends - // @@protoc_insertion_point(interface_extends:jellyfish.PeerMessage.Authenticated) + // @@protoc_insertion_point(interface_extends:fishjam.PeerMessage.Authenticated) com.google.protobuf.MessageOrBuilder { } /** - * Protobuf type {@code jellyfish.PeerMessage.Authenticated} + * 
+     * Response sent by FJ, confirming successfull authentication
+     *
+ * + * Protobuf type {@code fishjam.PeerMessage.Authenticated} */ public static final class Authenticated extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:jellyfish.PeerMessage.Authenticated) + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:fishjam.PeerMessage.Authenticated) AuthenticatedOrBuilder { private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + Authenticated.class.getName()); + } // Use Authenticated.newBuilder() to construct. - private Authenticated(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private Authenticated(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private Authenticated() { } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new Authenticated(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_Authenticated_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_Authenticated_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_Authenticated_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_Authenticated_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.Authenticated.class, jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder.class); + fishjam.PeerNotifications.PeerMessage.Authenticated.class, fishjam.PeerNotifications.PeerMessage.Authenticated.Builder.class); } private byte memoizedIsInitialized = -1; @@ -182,10 +194,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof jellyfish.PeerNotifications.PeerMessage.Authenticated)) { + if (!(obj instanceof fishjam.PeerNotifications.PeerMessage.Authenticated)) { return super.equals(obj); } - jellyfish.PeerNotifications.PeerMessage.Authenticated other = (jellyfish.PeerNotifications.PeerMessage.Authenticated) obj; + fishjam.PeerNotifications.PeerMessage.Authenticated other = (fishjam.PeerNotifications.PeerMessage.Authenticated) obj; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; @@ -203,73 +215,75 @@ public int hashCode() { return hash; } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom(byte[] data) + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom(java.io.InputStream input) + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseDelimitedFrom(java.io.InputStream input) + + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseDelimitedFrom( + + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( + public static fishjam.PeerNotifications.PeerMessage.Authenticated parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -278,7 +292,7 @@ public static jellyfish.PeerNotifications.PeerMessage.Authenticated parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(jellyfish.PeerNotifications.PeerMessage.Authenticated prototype) { + public static Builder newBuilder(fishjam.PeerNotifications.PeerMessage.Authenticated prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -289,37 +303,41 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * Protobuf type {@code jellyfish.PeerMessage.Authenticated} + * 
+       * Response sent by FJ, confirming successfull authentication
+       *
+ * + * Protobuf type {@code fishjam.PeerMessage.Authenticated} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:jellyfish.PeerMessage.Authenticated) - jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder { + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:fishjam.PeerMessage.Authenticated) + fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_Authenticated_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_Authenticated_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_Authenticated_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_Authenticated_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.Authenticated.class, jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder.class); + fishjam.PeerNotifications.PeerMessage.Authenticated.class, fishjam.PeerNotifications.PeerMessage.Authenticated.Builder.class); } - // Construct using jellyfish.PeerNotifications.PeerMessage.Authenticated.newBuilder() + // Construct using fishjam.PeerNotifications.PeerMessage.Authenticated.newBuilder() private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); } @@ -332,17 +350,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_Authenticated_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_Authenticated_descriptor; } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated getDefaultInstanceForType() { - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + public fishjam.PeerNotifications.PeerMessage.Authenticated getDefaultInstanceForType() { + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated build() { - jellyfish.PeerNotifications.PeerMessage.Authenticated result = buildPartial(); + public fishjam.PeerNotifications.PeerMessage.Authenticated build() { + fishjam.PeerNotifications.PeerMessage.Authenticated result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -350,56 +368,24 @@ public jellyfish.PeerNotifications.PeerMessage.Authenticated build() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated buildPartial() { - jellyfish.PeerNotifications.PeerMessage.Authenticated result = new jellyfish.PeerNotifications.PeerMessage.Authenticated(this); + public fishjam.PeerNotifications.PeerMessage.Authenticated buildPartial() { + fishjam.PeerNotifications.PeerMessage.Authenticated result = new fishjam.PeerNotifications.PeerMessage.Authenticated(this); onBuilt(); return result; } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof jellyfish.PeerNotifications.PeerMessage.Authenticated) { - return mergeFrom((jellyfish.PeerNotifications.PeerMessage.Authenticated)other); + if (other instanceof fishjam.PeerNotifications.PeerMessage.Authenticated) { + return mergeFrom((fishjam.PeerNotifications.PeerMessage.Authenticated)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(jellyfish.PeerNotifications.PeerMessage.Authenticated other) { - if (other == jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance()) return this; + public Builder mergeFrom(fishjam.PeerNotifications.PeerMessage.Authenticated other) { + if (other == fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -441,29 +427,17 @@ public Builder mergeFrom( } // finally return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - // @@protoc_insertion_point(builder_scope:jellyfish.PeerMessage.Authenticated) + // @@protoc_insertion_point(builder_scope:fishjam.PeerMessage.Authenticated) } - // @@protoc_insertion_point(class_scope:jellyfish.PeerMessage.Authenticated) - private static final jellyfish.PeerNotifications.PeerMessage.Authenticated DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:fishjam.PeerMessage.Authenticated) + private static final fishjam.PeerNotifications.PeerMessage.Authenticated DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new jellyfish.PeerNotifications.PeerMessage.Authenticated(); + DEFAULT_INSTANCE = new fishjam.PeerNotifications.PeerMessage.Authenticated(); } - public static jellyfish.PeerNotifications.PeerMessage.Authenticated getDefaultInstance() { + public static fishjam.PeerNotifications.PeerMessage.Authenticated getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -499,14 +473,14 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated getDefaultInstanceForType() { + public fishjam.PeerNotifications.PeerMessage.Authenticated getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface AuthRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:jellyfish.PeerMessage.AuthRequest) + // @@protoc_insertion_point(interface_extends:fishjam.PeerMessage.AuthRequest) com.google.protobuf.MessageOrBuilder { /** @@ -522,44 +496,45 @@ public interface AuthRequestOrBuilder extends getTokenBytes(); } /** - * Protobuf type {@code jellyfish.PeerMessage.AuthRequest} + * 
+     * Request sent by peer, to authenticate to FJ server
+     *
+ * + * Protobuf type {@code fishjam.PeerMessage.AuthRequest} */ public static final class AuthRequest extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:jellyfish.PeerMessage.AuthRequest) + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:fishjam.PeerMessage.AuthRequest) AuthRequestOrBuilder { private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + AuthRequest.class.getName()); + } // Use AuthRequest.newBuilder() to construct. - private AuthRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private AuthRequest(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private AuthRequest() { token_ = ""; } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new AuthRequest(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_AuthRequest_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_AuthRequest_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_AuthRequest_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_AuthRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.AuthRequest.class, jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder.class); + fishjam.PeerNotifications.PeerMessage.AuthRequest.class, fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder.class); } public static final int TOKEN_FIELD_NUMBER = 1; @@ -615,8 +590,8 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, token_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(token_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, token_); } getUnknownFields().writeTo(output); } @@ -627,8 +602,8 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, token_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(token_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, token_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -640,10 +615,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof jellyfish.PeerNotifications.PeerMessage.AuthRequest)) { + if (!(obj instanceof fishjam.PeerNotifications.PeerMessage.AuthRequest)) { return super.equals(obj); } - jellyfish.PeerNotifications.PeerMessage.AuthRequest other = (jellyfish.PeerNotifications.PeerMessage.AuthRequest) obj; + fishjam.PeerNotifications.PeerMessage.AuthRequest other = (fishjam.PeerNotifications.PeerMessage.AuthRequest) obj; if (!getToken() .equals(other.getToken())) return false; @@ -665,73 +640,75 @@ public int hashCode() { return hash; } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom(byte[] data) + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom(java.io.InputStream input) + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseDelimitedFrom(java.io.InputStream input) + + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseDelimitedFrom( + + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( + public static fishjam.PeerNotifications.PeerMessage.AuthRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -740,7 +717,7 @@ public static jellyfish.PeerNotifications.PeerMessage.AuthRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(jellyfish.PeerNotifications.PeerMessage.AuthRequest prototype) { + public static Builder newBuilder(fishjam.PeerNotifications.PeerMessage.AuthRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -751,37 +728,41 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * Protobuf type {@code jellyfish.PeerMessage.AuthRequest} + * 
+       * Request sent by peer, to authenticate to FJ server
+       *
+ * + * Protobuf type {@code fishjam.PeerMessage.AuthRequest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:jellyfish.PeerMessage.AuthRequest) - jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder { + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:fishjam.PeerMessage.AuthRequest) + fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_AuthRequest_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_AuthRequest_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_AuthRequest_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_AuthRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.AuthRequest.class, jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder.class); + fishjam.PeerNotifications.PeerMessage.AuthRequest.class, fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder.class); } - // Construct using jellyfish.PeerNotifications.PeerMessage.AuthRequest.newBuilder() + // Construct using fishjam.PeerNotifications.PeerMessage.AuthRequest.newBuilder() private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); } @@ -796,17 +777,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_AuthRequest_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_AuthRequest_descriptor; } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest getDefaultInstanceForType() { - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + public fishjam.PeerNotifications.PeerMessage.AuthRequest getDefaultInstanceForType() { + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest build() { - jellyfish.PeerNotifications.PeerMessage.AuthRequest result = buildPartial(); + public fishjam.PeerNotifications.PeerMessage.AuthRequest build() { + fishjam.PeerNotifications.PeerMessage.AuthRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -814,64 +795,32 @@ public jellyfish.PeerNotifications.PeerMessage.AuthRequest build() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest buildPartial() { - jellyfish.PeerNotifications.PeerMessage.AuthRequest result = new jellyfish.PeerNotifications.PeerMessage.AuthRequest(this); + public fishjam.PeerNotifications.PeerMessage.AuthRequest buildPartial() { + fishjam.PeerNotifications.PeerMessage.AuthRequest result = new fishjam.PeerNotifications.PeerMessage.AuthRequest(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(jellyfish.PeerNotifications.PeerMessage.AuthRequest result) { + private void buildPartial0(fishjam.PeerNotifications.PeerMessage.AuthRequest result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.token_ = token_; } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof jellyfish.PeerNotifications.PeerMessage.AuthRequest) { - return mergeFrom((jellyfish.PeerNotifications.PeerMessage.AuthRequest)other); + if (other instanceof fishjam.PeerNotifications.PeerMessage.AuthRequest) { + return mergeFrom((fishjam.PeerNotifications.PeerMessage.AuthRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(jellyfish.PeerNotifications.PeerMessage.AuthRequest other) { - if (other == jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance()) return this; + public Builder mergeFrom(fishjam.PeerNotifications.PeerMessage.AuthRequest other) { + if (other == fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance()) return this; if (!other.getToken().isEmpty()) { token_ = other.token_; bitField0_ |= 0x00000001; @@ -996,29 +945,17 @@ public Builder setTokenBytes( onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - // @@protoc_insertion_point(builder_scope:jellyfish.PeerMessage.AuthRequest) + // @@protoc_insertion_point(builder_scope:fishjam.PeerMessage.AuthRequest) } - // @@protoc_insertion_point(class_scope:jellyfish.PeerMessage.AuthRequest) - private static final jellyfish.PeerNotifications.PeerMessage.AuthRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:fishjam.PeerMessage.AuthRequest) + private static final fishjam.PeerNotifications.PeerMessage.AuthRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new jellyfish.PeerNotifications.PeerMessage.AuthRequest(); + DEFAULT_INSTANCE = new fishjam.PeerNotifications.PeerMessage.AuthRequest(); } - public static jellyfish.PeerNotifications.PeerMessage.AuthRequest getDefaultInstance() { + public static fishjam.PeerNotifications.PeerMessage.AuthRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1054,14 +991,14 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest getDefaultInstanceForType() { + public fishjam.PeerNotifications.PeerMessage.AuthRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface MediaEventOrBuilder extends - // @@protoc_insertion_point(interface_extends:jellyfish.PeerMessage.MediaEvent) + // @@protoc_insertion_point(interface_extends:fishjam.PeerMessage.MediaEvent) com.google.protobuf.MessageOrBuilder { /** @@ -1077,44 +1014,45 @@ public interface MediaEventOrBuilder extends getDataBytes(); } /** - * Protobuf type {@code jellyfish.PeerMessage.MediaEvent} + * 
+     * Any type of WebRTC messages passed betweend FJ and peer
+     *
+ * + * Protobuf type {@code fishjam.PeerMessage.MediaEvent} */ public static final class MediaEvent extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:jellyfish.PeerMessage.MediaEvent) + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:fishjam.PeerMessage.MediaEvent) MediaEventOrBuilder { private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + MediaEvent.class.getName()); + } // Use MediaEvent.newBuilder() to construct. - private MediaEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private MediaEvent(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private MediaEvent() { data_ = ""; } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new MediaEvent(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_MediaEvent_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_MediaEvent_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_MediaEvent_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_MediaEvent_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.MediaEvent.class, jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder.class); + fishjam.PeerNotifications.PeerMessage.MediaEvent.class, fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder.class); } public static final int DATA_FIELD_NUMBER = 1; @@ -1170,8 +1108,8 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(data_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, data_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(data_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, data_); } getUnknownFields().writeTo(output); } @@ -1182,8 +1120,8 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(data_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, data_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(data_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, data_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -1195,10 +1133,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof jellyfish.PeerNotifications.PeerMessage.MediaEvent)) { + if (!(obj instanceof fishjam.PeerNotifications.PeerMessage.MediaEvent)) { return super.equals(obj); } - jellyfish.PeerNotifications.PeerMessage.MediaEvent other = (jellyfish.PeerNotifications.PeerMessage.MediaEvent) obj; + fishjam.PeerNotifications.PeerMessage.MediaEvent other = (fishjam.PeerNotifications.PeerMessage.MediaEvent) obj; if (!getData() .equals(other.getData())) return false; @@ -1220,73 +1158,75 @@ public int hashCode() { return hash; } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom(byte[] data) + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom(java.io.InputStream input) + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseDelimitedFrom(java.io.InputStream input) + + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseDelimitedFrom( + + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( + public static fishjam.PeerNotifications.PeerMessage.MediaEvent parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -1295,7 +1235,7 @@ public static jellyfish.PeerNotifications.PeerMessage.MediaEvent parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(jellyfish.PeerNotifications.PeerMessage.MediaEvent prototype) { + public static Builder newBuilder(fishjam.PeerNotifications.PeerMessage.MediaEvent prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1306,37 +1246,41 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * Protobuf type {@code jellyfish.PeerMessage.MediaEvent} + * 
+       * Any type of WebRTC messages passed betweend FJ and peer
+       *
+ * + * Protobuf type {@code fishjam.PeerMessage.MediaEvent} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:jellyfish.PeerMessage.MediaEvent) - jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder { + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:fishjam.PeerMessage.MediaEvent) + fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_MediaEvent_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_MediaEvent_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_MediaEvent_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_MediaEvent_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.MediaEvent.class, jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder.class); + fishjam.PeerNotifications.PeerMessage.MediaEvent.class, fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder.class); } - // Construct using jellyfish.PeerNotifications.PeerMessage.MediaEvent.newBuilder() + // Construct using fishjam.PeerNotifications.PeerMessage.MediaEvent.newBuilder() private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); } @@ -1351,17 +1295,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_MediaEvent_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_MediaEvent_descriptor; } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent getDefaultInstanceForType() { - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + public fishjam.PeerNotifications.PeerMessage.MediaEvent getDefaultInstanceForType() { + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent build() { - jellyfish.PeerNotifications.PeerMessage.MediaEvent result = buildPartial(); + public fishjam.PeerNotifications.PeerMessage.MediaEvent build() { + fishjam.PeerNotifications.PeerMessage.MediaEvent result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1369,64 +1313,32 @@ public jellyfish.PeerNotifications.PeerMessage.MediaEvent build() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent buildPartial() { - jellyfish.PeerNotifications.PeerMessage.MediaEvent result = new jellyfish.PeerNotifications.PeerMessage.MediaEvent(this); + public fishjam.PeerNotifications.PeerMessage.MediaEvent buildPartial() { + fishjam.PeerNotifications.PeerMessage.MediaEvent result = new fishjam.PeerNotifications.PeerMessage.MediaEvent(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(jellyfish.PeerNotifications.PeerMessage.MediaEvent result) { + private void buildPartial0(fishjam.PeerNotifications.PeerMessage.MediaEvent result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.data_ = data_; } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof jellyfish.PeerNotifications.PeerMessage.MediaEvent) { - return mergeFrom((jellyfish.PeerNotifications.PeerMessage.MediaEvent)other); + if (other instanceof fishjam.PeerNotifications.PeerMessage.MediaEvent) { + return mergeFrom((fishjam.PeerNotifications.PeerMessage.MediaEvent)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(jellyfish.PeerNotifications.PeerMessage.MediaEvent other) { - if (other == jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance()) return this; + public Builder mergeFrom(fishjam.PeerNotifications.PeerMessage.MediaEvent other) { + if (other == fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance()) return this; if (!other.getData().isEmpty()) { data_ = other.data_; bitField0_ |= 0x00000001; @@ -1551,29 +1463,17 @@ public Builder setDataBytes( onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - // @@protoc_insertion_point(builder_scope:jellyfish.PeerMessage.MediaEvent) + // @@protoc_insertion_point(builder_scope:fishjam.PeerMessage.MediaEvent) } - // @@protoc_insertion_point(class_scope:jellyfish.PeerMessage.MediaEvent) - private static final jellyfish.PeerNotifications.PeerMessage.MediaEvent DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:fishjam.PeerMessage.MediaEvent) + private static final fishjam.PeerNotifications.PeerMessage.MediaEvent DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new jellyfish.PeerNotifications.PeerMessage.MediaEvent(); + DEFAULT_INSTANCE = new fishjam.PeerNotifications.PeerMessage.MediaEvent(); } - public static jellyfish.PeerNotifications.PeerMessage.MediaEvent getDefaultInstance() { + public static fishjam.PeerNotifications.PeerMessage.MediaEvent getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1609,13 +1509,14 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent getDefaultInstanceForType() { + public fishjam.PeerNotifications.PeerMessage.MediaEvent getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } private int contentCase_ = 0; + @SuppressWarnings("serial") private java.lang.Object content_; public enum ContentCase implements com.google.protobuf.Internal.EnumLite, @@ -1660,7 +1561,7 @@ public int getNumber() { public static final int AUTHENTICATED_FIELD_NUMBER = 1; /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return Whether the authenticated field is set. */ @java.lang.Override @@ -1668,30 +1569,30 @@ public boolean hasAuthenticated() { return contentCase_ == 1; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return The authenticated. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated getAuthenticated() { + public fishjam.PeerNotifications.PeerMessage.Authenticated getAuthenticated() { if (contentCase_ == 1) { - return (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_; + return (fishjam.PeerNotifications.PeerMessage.Authenticated) content_; } - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder() { if (contentCase_ == 1) { - return (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_; + return (fishjam.PeerNotifications.PeerMessage.Authenticated) content_; } - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } public static final int AUTH_REQUEST_FIELD_NUMBER = 2; /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return Whether the authRequest field is set. */ @java.lang.Override @@ -1699,30 +1600,30 @@ public boolean hasAuthRequest() { return contentCase_ == 2; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return The authRequest. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest getAuthRequest() { + public fishjam.PeerNotifications.PeerMessage.AuthRequest getAuthRequest() { if (contentCase_ == 2) { - return (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_; + return (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_; } - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder() { if (contentCase_ == 2) { - return (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_; + return (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_; } - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } public static final int MEDIA_EVENT_FIELD_NUMBER = 3; /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return Whether the mediaEvent field is set. */ @java.lang.Override @@ -1730,25 +1631,25 @@ public boolean hasMediaEvent() { return contentCase_ == 3; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return The mediaEvent. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent getMediaEvent() { + public fishjam.PeerNotifications.PeerMessage.MediaEvent getMediaEvent() { if (contentCase_ == 3) { - return (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_; + return (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_; } - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder() { if (contentCase_ == 3) { - return (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_; + return (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_; } - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -1766,13 +1667,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (contentCase_ == 1) { - output.writeMessage(1, (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_); + output.writeMessage(1, (fishjam.PeerNotifications.PeerMessage.Authenticated) content_); } if (contentCase_ == 2) { - output.writeMessage(2, (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_); + output.writeMessage(2, (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_); } if (contentCase_ == 3) { - output.writeMessage(3, (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_); + output.writeMessage(3, (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_); } getUnknownFields().writeTo(output); } @@ -1785,15 +1686,15 @@ public int getSerializedSize() { size = 0; if (contentCase_ == 1) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_); + .computeMessageSize(1, (fishjam.PeerNotifications.PeerMessage.Authenticated) content_); } if (contentCase_ == 2) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_); + .computeMessageSize(2, (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_); } if (contentCase_ == 3) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_); + .computeMessageSize(3, (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -1805,10 +1706,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof jellyfish.PeerNotifications.PeerMessage)) { + if (!(obj instanceof fishjam.PeerNotifications.PeerMessage)) { return super.equals(obj); } - jellyfish.PeerNotifications.PeerMessage other = (jellyfish.PeerNotifications.PeerMessage) obj; + fishjam.PeerNotifications.PeerMessage other = (fishjam.PeerNotifications.PeerMessage) obj; if (!getContentCase().equals(other.getContentCase())) return false; switch (contentCase_) { @@ -1859,73 +1760,75 @@ public int hashCode() { return hash; } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom(byte[] data) + public static fishjam.PeerNotifications.PeerMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom(java.io.InputStream input) + public static fishjam.PeerNotifications.PeerMessage parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage parseDelimitedFrom(java.io.InputStream input) + + public static fishjam.PeerNotifications.PeerMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage parseDelimitedFrom( + + public static fishjam.PeerNotifications.PeerMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static jellyfish.PeerNotifications.PeerMessage parseFrom( + public static fishjam.PeerNotifications.PeerMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 + return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input, extensionRegistry); } @@ -1934,7 +1837,7 @@ public static jellyfish.PeerNotifications.PeerMessage parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(jellyfish.PeerNotifications.PeerMessage prototype) { + public static Builder newBuilder(fishjam.PeerNotifications.PeerMessage prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1945,37 +1848,41 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * Protobuf type {@code jellyfish.PeerMessage} + * 
+     * Defines any type of message sent between FJ and a peer
+     *
+ * + * Protobuf type {@code fishjam.PeerMessage} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:jellyfish.PeerMessage) - jellyfish.PeerNotifications.PeerMessageOrBuilder { + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:fishjam.PeerMessage) + fishjam.PeerNotifications.PeerMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_fieldAccessorTable + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - jellyfish.PeerNotifications.PeerMessage.class, jellyfish.PeerNotifications.PeerMessage.Builder.class); + fishjam.PeerNotifications.PeerMessage.class, fishjam.PeerNotifications.PeerMessage.Builder.class); } - // Construct using jellyfish.PeerNotifications.PeerMessage.newBuilder() + // Construct using fishjam.PeerNotifications.PeerMessage.newBuilder() private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); } @@ -2000,17 +1907,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return jellyfish.PeerNotifications.internal_static_jellyfish_PeerMessage_descriptor; + return fishjam.PeerNotifications.internal_static_fishjam_PeerMessage_descriptor; } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage getDefaultInstanceForType() { - return jellyfish.PeerNotifications.PeerMessage.getDefaultInstance(); + public fishjam.PeerNotifications.PeerMessage getDefaultInstanceForType() { + return fishjam.PeerNotifications.PeerMessage.getDefaultInstance(); } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage build() { - jellyfish.PeerNotifications.PeerMessage result = buildPartial(); + public fishjam.PeerNotifications.PeerMessage build() { + fishjam.PeerNotifications.PeerMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2018,19 +1925,19 @@ public jellyfish.PeerNotifications.PeerMessage build() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage buildPartial() { - jellyfish.PeerNotifications.PeerMessage result = new jellyfish.PeerNotifications.PeerMessage(this); + public fishjam.PeerNotifications.PeerMessage buildPartial() { + fishjam.PeerNotifications.PeerMessage result = new fishjam.PeerNotifications.PeerMessage(this); if (bitField0_ != 0) { buildPartial0(result); } buildPartialOneofs(result); onBuilt(); return result; } - private void buildPartial0(jellyfish.PeerNotifications.PeerMessage result) { + private void buildPartial0(fishjam.PeerNotifications.PeerMessage result) { int from_bitField0_ = bitField0_; } - private void buildPartialOneofs(jellyfish.PeerNotifications.PeerMessage result) { + private void buildPartialOneofs(fishjam.PeerNotifications.PeerMessage result) { result.contentCase_ = contentCase_; result.content_ = this.content_; if (contentCase_ == 1 && @@ -2047,50 +1954,18 @@ private void buildPartialOneofs(jellyfish.PeerNotifications.PeerMessage result) } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof jellyfish.PeerNotifications.PeerMessage) { - return mergeFrom((jellyfish.PeerNotifications.PeerMessage)other); + if (other instanceof fishjam.PeerNotifications.PeerMessage) { + return mergeFrom((fishjam.PeerNotifications.PeerMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(jellyfish.PeerNotifications.PeerMessage other) { - if (other == jellyfish.PeerNotifications.PeerMessage.getDefaultInstance()) return this; + public Builder mergeFrom(fishjam.PeerNotifications.PeerMessage other) { + if (other == fishjam.PeerNotifications.PeerMessage.getDefaultInstance()) return this; switch (other.getContentCase()) { case AUTHENTICATED: { mergeAuthenticated(other.getAuthenticated()); @@ -2187,10 +2062,10 @@ public Builder clearContent() { private int bitField0_; - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.Authenticated, jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder, jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder> authenticatedBuilder_; + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.Authenticated, fishjam.PeerNotifications.PeerMessage.Authenticated.Builder, fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder> authenticatedBuilder_; /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return Whether the authenticated field is set. */ @java.lang.Override @@ -2198,27 +2073,27 @@ public boolean hasAuthenticated() { return contentCase_ == 1; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; * @return The authenticated. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.Authenticated getAuthenticated() { + public fishjam.PeerNotifications.PeerMessage.Authenticated getAuthenticated() { if (authenticatedBuilder_ == null) { if (contentCase_ == 1) { - return (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_; + return (fishjam.PeerNotifications.PeerMessage.Authenticated) content_; } - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } else { if (contentCase_ == 1) { return authenticatedBuilder_.getMessage(); } - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ - public Builder setAuthenticated(jellyfish.PeerNotifications.PeerMessage.Authenticated value) { + public Builder setAuthenticated(fishjam.PeerNotifications.PeerMessage.Authenticated value) { if (authenticatedBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2232,10 +2107,10 @@ public Builder setAuthenticated(jellyfish.PeerNotifications.PeerMessage.Authenti return this; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ public Builder setAuthenticated( - jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder builderForValue) { + fishjam.PeerNotifications.PeerMessage.Authenticated.Builder builderForValue) { if (authenticatedBuilder_ == null) { content_ = builderForValue.build(); onChanged(); @@ -2246,13 +2121,13 @@ public Builder setAuthenticated( return this; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ - public Builder mergeAuthenticated(jellyfish.PeerNotifications.PeerMessage.Authenticated value) { + public Builder mergeAuthenticated(fishjam.PeerNotifications.PeerMessage.Authenticated value) { if (authenticatedBuilder_ == null) { if (contentCase_ == 1 && - content_ != jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance()) { - content_ = jellyfish.PeerNotifications.PeerMessage.Authenticated.newBuilder((jellyfish.PeerNotifications.PeerMessage.Authenticated) content_) + content_ != fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance()) { + content_ = fishjam.PeerNotifications.PeerMessage.Authenticated.newBuilder((fishjam.PeerNotifications.PeerMessage.Authenticated) content_) .mergeFrom(value).buildPartial(); } else { content_ = value; @@ -2269,7 +2144,7 @@ public Builder mergeAuthenticated(jellyfish.PeerNotifications.PeerMessage.Authen return this; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ public Builder clearAuthenticated() { if (authenticatedBuilder_ == null) { @@ -2288,38 +2163,38 @@ public Builder clearAuthenticated() { return this; } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ - public jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder getAuthenticatedBuilder() { + public fishjam.PeerNotifications.PeerMessage.Authenticated.Builder getAuthenticatedBuilder() { return getAuthenticatedFieldBuilder().getBuilder(); } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthenticatedOrBuilder() { if ((contentCase_ == 1) && (authenticatedBuilder_ != null)) { return authenticatedBuilder_.getMessageOrBuilder(); } else { if (contentCase_ == 1) { - return (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_; + return (fishjam.PeerNotifications.PeerMessage.Authenticated) content_; } - return jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; + * .fishjam.PeerMessage.Authenticated authenticated = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.Authenticated, jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder, jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder> + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.Authenticated, fishjam.PeerNotifications.PeerMessage.Authenticated.Builder, fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder> getAuthenticatedFieldBuilder() { if (authenticatedBuilder_ == null) { if (!(contentCase_ == 1)) { - content_ = jellyfish.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); + content_ = fishjam.PeerNotifications.PeerMessage.Authenticated.getDefaultInstance(); } - authenticatedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.Authenticated, jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder, jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder>( - (jellyfish.PeerNotifications.PeerMessage.Authenticated) content_, + authenticatedBuilder_ = new com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.Authenticated, fishjam.PeerNotifications.PeerMessage.Authenticated.Builder, fishjam.PeerNotifications.PeerMessage.AuthenticatedOrBuilder>( + (fishjam.PeerNotifications.PeerMessage.Authenticated) content_, getParentForChildren(), isClean()); content_ = null; @@ -2329,10 +2204,10 @@ public jellyfish.PeerNotifications.PeerMessage.AuthenticatedOrBuilder getAuthent return authenticatedBuilder_; } - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.AuthRequest, jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder, jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder> authRequestBuilder_; + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.AuthRequest, fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder, fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder> authRequestBuilder_; /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return Whether the authRequest field is set. */ @java.lang.Override @@ -2340,27 +2215,27 @@ public boolean hasAuthRequest() { return contentCase_ == 2; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; * @return The authRequest. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequest getAuthRequest() { + public fishjam.PeerNotifications.PeerMessage.AuthRequest getAuthRequest() { if (authRequestBuilder_ == null) { if (contentCase_ == 2) { - return (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_; + return (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_; } - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } else { if (contentCase_ == 2) { return authRequestBuilder_.getMessage(); } - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ - public Builder setAuthRequest(jellyfish.PeerNotifications.PeerMessage.AuthRequest value) { + public Builder setAuthRequest(fishjam.PeerNotifications.PeerMessage.AuthRequest value) { if (authRequestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2374,10 +2249,10 @@ public Builder setAuthRequest(jellyfish.PeerNotifications.PeerMessage.AuthReques return this; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ public Builder setAuthRequest( - jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder builderForValue) { + fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder builderForValue) { if (authRequestBuilder_ == null) { content_ = builderForValue.build(); onChanged(); @@ -2388,13 +2263,13 @@ public Builder setAuthRequest( return this; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ - public Builder mergeAuthRequest(jellyfish.PeerNotifications.PeerMessage.AuthRequest value) { + public Builder mergeAuthRequest(fishjam.PeerNotifications.PeerMessage.AuthRequest value) { if (authRequestBuilder_ == null) { if (contentCase_ == 2 && - content_ != jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance()) { - content_ = jellyfish.PeerNotifications.PeerMessage.AuthRequest.newBuilder((jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_) + content_ != fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance()) { + content_ = fishjam.PeerNotifications.PeerMessage.AuthRequest.newBuilder((fishjam.PeerNotifications.PeerMessage.AuthRequest) content_) .mergeFrom(value).buildPartial(); } else { content_ = value; @@ -2411,7 +2286,7 @@ public Builder mergeAuthRequest(jellyfish.PeerNotifications.PeerMessage.AuthRequ return this; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ public Builder clearAuthRequest() { if (authRequestBuilder_ == null) { @@ -2430,38 +2305,38 @@ public Builder clearAuthRequest() { return this; } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ - public jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder getAuthRequestBuilder() { + public fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder getAuthRequestBuilder() { return getAuthRequestFieldBuilder().getBuilder(); } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthRequestOrBuilder() { if ((contentCase_ == 2) && (authRequestBuilder_ != null)) { return authRequestBuilder_.getMessageOrBuilder(); } else { if (contentCase_ == 2) { - return (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_; + return (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_; } - return jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; + * .fishjam.PeerMessage.AuthRequest auth_request = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.AuthRequest, jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder, jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder> + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.AuthRequest, fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder, fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder> getAuthRequestFieldBuilder() { if (authRequestBuilder_ == null) { if (!(contentCase_ == 2)) { - content_ = jellyfish.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); + content_ = fishjam.PeerNotifications.PeerMessage.AuthRequest.getDefaultInstance(); } - authRequestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.AuthRequest, jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder, jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder>( - (jellyfish.PeerNotifications.PeerMessage.AuthRequest) content_, + authRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.AuthRequest, fishjam.PeerNotifications.PeerMessage.AuthRequest.Builder, fishjam.PeerNotifications.PeerMessage.AuthRequestOrBuilder>( + (fishjam.PeerNotifications.PeerMessage.AuthRequest) content_, getParentForChildren(), isClean()); content_ = null; @@ -2471,10 +2346,10 @@ public jellyfish.PeerNotifications.PeerMessage.AuthRequestOrBuilder getAuthReque return authRequestBuilder_; } - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.MediaEvent, jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder, jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder> mediaEventBuilder_; + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.MediaEvent, fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder, fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder> mediaEventBuilder_; /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return Whether the mediaEvent field is set. */ @java.lang.Override @@ -2482,27 +2357,27 @@ public boolean hasMediaEvent() { return contentCase_ == 3; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; * @return The mediaEvent. */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEvent getMediaEvent() { + public fishjam.PeerNotifications.PeerMessage.MediaEvent getMediaEvent() { if (mediaEventBuilder_ == null) { if (contentCase_ == 3) { - return (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_; + return (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_; } - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } else { if (contentCase_ == 3) { return mediaEventBuilder_.getMessage(); } - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ - public Builder setMediaEvent(jellyfish.PeerNotifications.PeerMessage.MediaEvent value) { + public Builder setMediaEvent(fishjam.PeerNotifications.PeerMessage.MediaEvent value) { if (mediaEventBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2516,10 +2391,10 @@ public Builder setMediaEvent(jellyfish.PeerNotifications.PeerMessage.MediaEvent return this; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ public Builder setMediaEvent( - jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder builderForValue) { + fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder builderForValue) { if (mediaEventBuilder_ == null) { content_ = builderForValue.build(); onChanged(); @@ -2530,13 +2405,13 @@ public Builder setMediaEvent( return this; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ - public Builder mergeMediaEvent(jellyfish.PeerNotifications.PeerMessage.MediaEvent value) { + public Builder mergeMediaEvent(fishjam.PeerNotifications.PeerMessage.MediaEvent value) { if (mediaEventBuilder_ == null) { if (contentCase_ == 3 && - content_ != jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance()) { - content_ = jellyfish.PeerNotifications.PeerMessage.MediaEvent.newBuilder((jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_) + content_ != fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance()) { + content_ = fishjam.PeerNotifications.PeerMessage.MediaEvent.newBuilder((fishjam.PeerNotifications.PeerMessage.MediaEvent) content_) .mergeFrom(value).buildPartial(); } else { content_ = value; @@ -2553,7 +2428,7 @@ public Builder mergeMediaEvent(jellyfish.PeerNotifications.PeerMessage.MediaEven return this; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ public Builder clearMediaEvent() { if (mediaEventBuilder_ == null) { @@ -2572,38 +2447,38 @@ public Builder clearMediaEvent() { return this; } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ - public jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder getMediaEventBuilder() { + public fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder getMediaEventBuilder() { return getMediaEventFieldBuilder().getBuilder(); } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder() { + public fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEventOrBuilder() { if ((contentCase_ == 3) && (mediaEventBuilder_ != null)) { return mediaEventBuilder_.getMessageOrBuilder(); } else { if (contentCase_ == 3) { - return (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_; + return (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_; } - return jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + return fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } } /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; + * .fishjam.PeerMessage.MediaEvent media_event = 3; */ - private com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.MediaEvent, jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder, jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder> + private com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.MediaEvent, fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder, fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder> getMediaEventFieldBuilder() { if (mediaEventBuilder_ == null) { if (!(contentCase_ == 3)) { - content_ = jellyfish.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); + content_ = fishjam.PeerNotifications.PeerMessage.MediaEvent.getDefaultInstance(); } - mediaEventBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - jellyfish.PeerNotifications.PeerMessage.MediaEvent, jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder, jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder>( - (jellyfish.PeerNotifications.PeerMessage.MediaEvent) content_, + mediaEventBuilder_ = new com.google.protobuf.SingleFieldBuilder< + fishjam.PeerNotifications.PeerMessage.MediaEvent, fishjam.PeerNotifications.PeerMessage.MediaEvent.Builder, fishjam.PeerNotifications.PeerMessage.MediaEventOrBuilder>( + (fishjam.PeerNotifications.PeerMessage.MediaEvent) content_, getParentForChildren(), isClean()); content_ = null; @@ -2612,29 +2487,17 @@ public jellyfish.PeerNotifications.PeerMessage.MediaEventOrBuilder getMediaEvent onChanged(); return mediaEventBuilder_; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - // @@protoc_insertion_point(builder_scope:jellyfish.PeerMessage) + // @@protoc_insertion_point(builder_scope:fishjam.PeerMessage) } - // @@protoc_insertion_point(class_scope:jellyfish.PeerMessage) - private static final jellyfish.PeerNotifications.PeerMessage DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:fishjam.PeerMessage) + private static final fishjam.PeerNotifications.PeerMessage DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new jellyfish.PeerNotifications.PeerMessage(); + DEFAULT_INSTANCE = new fishjam.PeerNotifications.PeerMessage(); } - public static jellyfish.PeerNotifications.PeerMessage getDefaultInstance() { + public static fishjam.PeerNotifications.PeerMessage getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -2670,32 +2533,32 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public jellyfish.PeerNotifications.PeerMessage getDefaultInstanceForType() { + public fishjam.PeerNotifications.PeerMessage getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_jellyfish_PeerMessage_descriptor; + internal_static_fishjam_PeerMessage_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_jellyfish_PeerMessage_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_fishjam_PeerMessage_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_jellyfish_PeerMessage_Authenticated_descriptor; + internal_static_fishjam_PeerMessage_Authenticated_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_jellyfish_PeerMessage_Authenticated_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_fishjam_PeerMessage_Authenticated_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_jellyfish_PeerMessage_AuthRequest_descriptor; + internal_static_fishjam_PeerMessage_AuthRequest_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_jellyfish_PeerMessage_AuthRequest_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_fishjam_PeerMessage_AuthRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_jellyfish_PeerMessage_MediaEvent_descriptor; + internal_static_fishjam_PeerMessage_MediaEvent_descriptor; private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_jellyfish_PeerMessage_MediaEvent_fieldAccessorTable; + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_fishjam_PeerMessage_MediaEvent_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2705,44 +2568,45 @@ public jellyfish.PeerNotifications.PeerMessage getDefaultInstanceForType() { descriptor; static { java.lang.String[] descriptorData = { - "\n\"jellyfish/peer_notifications.proto\022\tje" + - "llyfish\"\230\002\n\013PeerMessage\022=\n\rauthenticated" + - "\030\001 \001(\0132$.jellyfish.PeerMessage.Authentic" + - "atedH\000\022:\n\014auth_request\030\002 \001(\0132\".jellyfish" + - ".PeerMessage.AuthRequestH\000\0228\n\013media_even" + - "t\030\003 \001(\0132!.jellyfish.PeerMessage.MediaEve" + - "ntH\000\032\017\n\rAuthenticated\032\034\n\013AuthRequest\022\r\n\005" + - "token\030\001 \001(\t\032\032\n\nMediaEvent\022\014\n\004data\030\001 \001(\tB" + - "\t\n\007contentb\006proto3" + "\n fishjam/peer_notifications.proto\022\007fish" + + "jam\"\222\002\n\013PeerMessage\022;\n\rauthenticated\030\001 \001" + + "(\0132\".fishjam.PeerMessage.AuthenticatedH\000" + + "\0228\n\014auth_request\030\002 \001(\0132 .fishjam.PeerMes" + + "sage.AuthRequestH\000\0226\n\013media_event\030\003 \001(\0132" + + "\037.fishjam.PeerMessage.MediaEventH\000\032\017\n\rAu" + + "thenticated\032\034\n\013AuthRequest\022\r\n\005token\030\001 \001(" + + "\t\032\032\n\nMediaEvent\022\014\n\004data\030\001 \001(\tB\t\n\007content" + + "b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_jellyfish_PeerMessage_descriptor = + internal_static_fishjam_PeerMessage_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_jellyfish_PeerMessage_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_jellyfish_PeerMessage_descriptor, + internal_static_fishjam_PeerMessage_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_fishjam_PeerMessage_descriptor, new java.lang.String[] { "Authenticated", "AuthRequest", "MediaEvent", "Content", }); - internal_static_jellyfish_PeerMessage_Authenticated_descriptor = - internal_static_jellyfish_PeerMessage_descriptor.getNestedTypes().get(0); - internal_static_jellyfish_PeerMessage_Authenticated_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_jellyfish_PeerMessage_Authenticated_descriptor, + internal_static_fishjam_PeerMessage_Authenticated_descriptor = + internal_static_fishjam_PeerMessage_descriptor.getNestedTypes().get(0); + internal_static_fishjam_PeerMessage_Authenticated_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_fishjam_PeerMessage_Authenticated_descriptor, new java.lang.String[] { }); - internal_static_jellyfish_PeerMessage_AuthRequest_descriptor = - internal_static_jellyfish_PeerMessage_descriptor.getNestedTypes().get(1); - internal_static_jellyfish_PeerMessage_AuthRequest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_jellyfish_PeerMessage_AuthRequest_descriptor, + internal_static_fishjam_PeerMessage_AuthRequest_descriptor = + internal_static_fishjam_PeerMessage_descriptor.getNestedTypes().get(1); + internal_static_fishjam_PeerMessage_AuthRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_fishjam_PeerMessage_AuthRequest_descriptor, new java.lang.String[] { "Token", }); - internal_static_jellyfish_PeerMessage_MediaEvent_descriptor = - internal_static_jellyfish_PeerMessage_descriptor.getNestedTypes().get(2); - internal_static_jellyfish_PeerMessage_MediaEvent_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_jellyfish_PeerMessage_MediaEvent_descriptor, + internal_static_fishjam_PeerMessage_MediaEvent_descriptor = + internal_static_fishjam_PeerMessage_descriptor.getNestedTypes().get(2); + internal_static_fishjam_PeerMessage_MediaEvent_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_fishjam_PeerMessage_MediaEvent_descriptor, new java.lang.String[] { "Data", }); + descriptor.resolveAllFeaturesImmutable(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/FishjamClient/src/main/java/fishjam/PeerNotificationsKt.kt b/FishjamClient/src/main/java/fishjam/PeerNotificationsKt.kt new file mode 100644 index 0000000..87294b1 --- /dev/null +++ b/FishjamClient/src/main/java/fishjam/PeerNotificationsKt.kt @@ -0,0 +1,7 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: fishjam/peer_notifications.proto + +// Generated files should ignore deprecation warnings +@file:Suppress("DEPRECATION") +package fishjam; + diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/Constants.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/Constants.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/Constants.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/Constants.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/CreateOptions.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/CreateOptions.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/CreateOptions.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/CreateOptions.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/Encoder.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/Encoder.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/Encoder.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/Encoder.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt similarity index 99% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt index d90e4d5..5e80856 100644 --- a/JellyfishClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt +++ b/FishjamClient/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt @@ -2,7 +2,7 @@ package org.membraneframework.rtc import android.content.Context import android.content.Intent -import com.jellyfishdev.jellyfishclient.BuildConfig +import com.fishjam.client.BuildConfig import kotlinx.coroutines.* import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTC.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTC.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTC.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTC.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTCError.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTCError.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTCError.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTCError.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTCListener.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTCListener.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/MembraneRTCListener.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/MembraneRTCListener.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionFactoryWrapper.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionFactoryWrapper.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionFactoryWrapper.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionFactoryWrapper.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionListener.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionListener.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionListener.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionListener.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionManager.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionManager.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/PeerConnectionManager.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/PeerConnectionManager.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/dagger/MembraneRTCComponent.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/dagger/MembraneRTCComponent.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/dagger/MembraneRTCComponent.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/dagger/MembraneRTCComponent.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/dagger/RTCModule.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/dagger/RTCModule.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/dagger/RTCModule.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/dagger/RTCModule.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/events/Event.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/events/Event.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/events/Event.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/events/Event.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/AudioTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/AudioTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/AudioTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/AudioTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalAudioTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalAudioTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalAudioTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalAudioTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalScreencastTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalScreencastTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalScreencastTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalScreencastTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalVideoTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalVideoTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/LocalVideoTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/LocalVideoTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/MediaTrackProvider.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/MediaTrackProvider.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/MediaTrackProvider.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/MediaTrackProvider.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/OnSoundDetectedListener.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/OnSoundDetectedListener.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/OnSoundDetectedListener.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/OnSoundDetectedListener.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteAudioTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteAudioTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteAudioTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteAudioTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteVideoTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteVideoTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/RemoteVideoTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/RemoteVideoTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/SimulcastVideoEncoderFactoryWrapper.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/SimulcastVideoEncoderFactoryWrapper.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/SimulcastVideoEncoderFactoryWrapper.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/SimulcastVideoEncoderFactoryWrapper.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/SoundDetection.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/SoundDetection.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/SoundDetection.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/SoundDetection.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/TrackBandwidthLimit.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/TrackBandwidthLimit.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/TrackBandwidthLimit.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/TrackBandwidthLimit.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/VideoParameters.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/VideoParameters.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/VideoParameters.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/VideoParameters.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/VideoTrack.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/VideoTrack.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/VideoTrack.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/VideoTrack.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastService.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastService.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastService.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastService.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastServiceConnector.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastServiceConnector.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastServiceConnector.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/media/screencast/ScreencastServiceConnector.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/EncodingReason.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/EncodingReason.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/EncodingReason.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/EncodingReason.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/Endpoint.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/Endpoint.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/Endpoint.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/Endpoint.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/RTCStats.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/RTCStats.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/RTCStats.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/RTCStats.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/TrackContext.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/TrackContext.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/TrackContext.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/TrackContext.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/TrackData.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/TrackData.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/TrackData.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/TrackData.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/models/VadStatus.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/models/VadStatus.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/models/VadStatus.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/models/VadStatus.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/transport/PhoenixTransport.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/transport/PhoenixTransport.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/transport/PhoenixTransport.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/transport/PhoenixTransport.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/ui/VideoTextureViewRenderer.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/ui/VideoTextureViewRenderer.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/ui/VideoTextureViewRenderer.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/ui/VideoTextureViewRenderer.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/utils/ClosableCoroutineScope.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/utils/ClosableCoroutineScope.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/utils/ClosableCoroutineScope.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/utils/ClosableCoroutineScope.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/utils/EndpointConnectionUtils.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/utils/EndpointConnectionUtils.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/utils/EndpointConnectionUtils.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/utils/EndpointConnectionUtils.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/utils/SuspendableSdpObserver.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/utils/SuspendableSdpObserver.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/utils/SuspendableSdpObserver.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/utils/SuspendableSdpObserver.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/utils/TimberDebugTree.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/utils/TimberDebugTree.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/utils/TimberDebugTree.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/utils/TimberDebugTree.kt diff --git a/JellyfishClient/src/main/java/org/membraneframework/rtc/utils/types.kt b/FishjamClient/src/main/java/org/membraneframework/rtc/utils/types.kt similarity index 100% rename from JellyfishClient/src/main/java/org/membraneframework/rtc/utils/types.kt rename to FishjamClient/src/main/java/org/membraneframework/rtc/utils/types.kt diff --git a/JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/JellyfishClientTest.kt b/FishjamClient/src/test/java/fishjam/client/FishjamClientTest.kt similarity index 57% rename from JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/JellyfishClientTest.kt rename to FishjamClient/src/test/java/fishjam/client/FishjamClientTest.kt index 2aad8ce..809e689 100644 --- a/JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/JellyfishClientTest.kt +++ b/FishjamClient/src/test/java/fishjam/client/FishjamClientTest.kt @@ -1,41 +1,40 @@ import android.content.Context -import com.jellyfishdev.jellyfishclient.Config -import com.jellyfishdev.jellyfishclient.JellyfishClient -import com.jellyfishdev.jellyfishclient.JellyfishClientListener +import com.fishjam.client.Config +import com.fishjam.client.FishjamClient +import com.fishjam.client.FishjamClientListener import io.mockk.confirmVerified import io.mockk.every import io.mockk.mockk import io.mockk.mockkObject import io.mockk.slot import io.mockk.verify -import jellyfish.PeerNotifications.PeerMessage -import jellyfish.PeerNotifications.PeerMessage.MediaEvent -import jellyfishdev.jellyfishclient.WebsocketMock +import fishjamdev.fishjamclient.WebsocketMock +import fishjam.PeerNotifications import org.junit.After import org.junit.Before import org.junit.Test import org.membraneframework.rtc.MembraneRTC import org.membraneframework.rtc.MembraneRTCListener -class JellyfishClientTest { +class FishjamClientTest { private val context = mockk() private val webrtcListener = slot() private val webrtcClient = mockk(relaxed = true) private lateinit var websocketMock: WebsocketMock - private lateinit var jellyfishClientListener: JellyfishClientListener - private lateinit var client: JellyfishClient + private lateinit var fishjamClientListener: FishjamClientListener + private lateinit var client: FishjamClient private val url = "ws://localhost:4000/socket/peer/websocket" private val token = "auth" - private val authRequest = PeerMessage + private val authRequest = PeerNotifications.PeerMessage .newBuilder() - .setAuthRequest(PeerMessage.AuthRequest.newBuilder().setToken(token)) + .setAuthRequest(PeerNotifications.PeerMessage.AuthRequest.newBuilder().setToken(token)) .build() - private val authenticated = PeerMessage + private val authenticated = PeerNotifications.PeerMessage .newBuilder() - .setAuthenticated(PeerMessage.Authenticated.newBuilder()) + .setAuthenticated(PeerNotifications.PeerMessage.Authenticated.newBuilder()) .build() init { @@ -45,41 +44,41 @@ class JellyfishClientTest { @Before fun initMocksAndConnect() { websocketMock = WebsocketMock() - jellyfishClientListener = mockk(relaxed = true) - client = JellyfishClient(context, jellyfishClientListener) + fishjamClientListener = mockk(relaxed = true) + client = FishjamClient(context, fishjamClientListener) client.connect(Config(websocketUrl = url, token = token)) websocketMock.open() - verify { jellyfishClientListener.onSocketOpen() } + verify { fishjamClientListener.onSocketOpen() } websocketMock.expect(authRequest) } @Test fun authenticates() { websocketMock.sendToClient(authenticated) - verify { jellyfishClientListener.onAuthSuccess() } + verify { fishjamClientListener.onAuthSuccess() } } @Test fun cleansUp() { client.cleanUp() verify { webrtcClient.disconnect() } websocketMock.expectClosed() - verify { jellyfishClientListener.onDisconnected() } + verify { fishjamClientListener.onDisconnected() } } @Test fun receivesAndSendsMediaEvents() { - val sdpOfferMediaEvent = PeerMessage + val sdpOfferMediaEvent = PeerNotifications.PeerMessage .newBuilder() - .setMediaEvent(MediaEvent.newBuilder().setData("sdpOffer")) + .setMediaEvent(PeerNotifications.PeerMessage.MediaEvent.newBuilder().setData("sdpOffer")) .build() - val joinMediaEvent = PeerMessage + val joinMediaEvent = PeerNotifications.PeerMessage .newBuilder() - .setMediaEvent(MediaEvent.newBuilder().setData("join")) + .setMediaEvent(PeerNotifications.PeerMessage.MediaEvent.newBuilder().setData("join")) .build() websocketMock.sendToClient(authenticated) - verify { jellyfishClientListener.onAuthSuccess() } + verify { fishjamClientListener.onAuthSuccess() } webrtcListener.captured.onSendMediaEvent("join") @@ -92,16 +91,16 @@ class JellyfishClientTest { @Test fun callsOnSocketError() { websocketMock.error() - verify { jellyfishClientListener.onSocketError(any(), any()) } + verify { fishjamClientListener.onSocketError(any(), any()) } } @Test fun callsOnSocketClosed() { websocketMock.close() - verify { jellyfishClientListener.onSocketClose(any(), any()) } + verify { fishjamClientListener.onSocketClose(any(), any()) } } @After fun confirmVerified() { - confirmVerified(jellyfishClientListener) + confirmVerified(fishjamClientListener) confirmVerified(webrtcClient) websocketMock.confirmVerified() } diff --git a/JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/WebsocketMock.kt b/FishjamClient/src/test/java/fishjam/client/WebsocketMock.kt similarity index 88% rename from JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/WebsocketMock.kt rename to FishjamClient/src/test/java/fishjam/client/WebsocketMock.kt index 9ea27bd..3d84730 100644 --- a/JellyfishClient/src/test/java/jellyfishdev/jellyfishclient/WebsocketMock.kt +++ b/FishjamClient/src/test/java/fishjam/client/WebsocketMock.kt @@ -1,7 +1,7 @@ -package jellyfishdev.jellyfishclient +package fishjamdev.fishjamclient import com.google.protobuf.ByteString -import com.google.protobuf.GeneratedMessageV3 +import com.google.protobuf.GeneratedMessage import io.mockk.every import io.mockk.mockk import io.mockk.mockkConstructor @@ -31,12 +31,12 @@ class WebsocketMock { verify { websocketMock.close(1000, null) } } - fun expect(message: GeneratedMessageV3) { + fun expect(message: GeneratedMessage) { val messageBytes = message.toByteArray().toByteString() verify(exactly = 1) { websocketMock.send(match { it == messageBytes }) } } - fun sendToClient(message: GeneratedMessageV3) { + fun sendToClient(message: GeneratedMessage) { val messageBytes = message.toByteArray().toByteString() clientListener.captured.onMessage(websocketMock, messageBytes) } diff --git a/JellyfishClient/src/test/java/org/membraneframework/rtc/test/EndpointConnectionManagerTest.kt b/FishjamClient/src/test/java/org/membraneframework/rtc/test/EndpointConnectionManagerTest.kt similarity index 100% rename from JellyfishClient/src/test/java/org/membraneframework/rtc/test/EndpointConnectionManagerTest.kt rename to FishjamClient/src/test/java/org/membraneframework/rtc/test/EndpointConnectionManagerTest.kt diff --git a/JellyfishClient/src/main/java/jellyfish/PeerMessageKt.kt b/JellyfishClient/src/main/java/jellyfish/PeerMessageKt.kt deleted file mode 100644 index 11db2d2..0000000 --- a/JellyfishClient/src/main/java/jellyfish/PeerMessageKt.kt +++ /dev/null @@ -1,239 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: jellyfish/peer_notifications.proto - -package jellyfish - -@kotlin.jvm.JvmName("-initializepeerMessage") -public inline fun peerMessage(block: jellyfish.PeerMessageKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage = - jellyfish.PeerMessageKt.Dsl._create(jellyfish.PeerNotifications.PeerMessage.newBuilder()).apply { block() }._build() -public object PeerMessageKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - public class Dsl private constructor( - private val _builder: jellyfish.PeerNotifications.PeerMessage.Builder, - ) { - public companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: jellyfish.PeerNotifications.PeerMessage.Builder): Dsl = Dsl(builder) - } - - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): jellyfish.PeerNotifications.PeerMessage = _builder.build() - - /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; - */ - public var authenticated: jellyfish.PeerNotifications.PeerMessage.Authenticated - @JvmName("getAuthenticated") - get() = _builder.getAuthenticated() - - @JvmName("setAuthenticated") - set(value) { - _builder.setAuthenticated(value) - } - - /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; - */ - public fun clearAuthenticated() { - _builder.clearAuthenticated() - } - - /** - * .jellyfish.PeerMessage.Authenticated authenticated = 1; - * @return Whether the authenticated field is set. - */ - public fun hasAuthenticated(): kotlin.Boolean { - return _builder.hasAuthenticated() - } - - /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; - */ - public var authRequest: jellyfish.PeerNotifications.PeerMessage.AuthRequest - @JvmName("getAuthRequest") - get() = _builder.getAuthRequest() - - @JvmName("setAuthRequest") - set(value) { - _builder.setAuthRequest(value) - } - - /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; - */ - public fun clearAuthRequest() { - _builder.clearAuthRequest() - } - - /** - * .jellyfish.PeerMessage.AuthRequest auth_request = 2; - * @return Whether the authRequest field is set. - */ - public fun hasAuthRequest(): kotlin.Boolean { - return _builder.hasAuthRequest() - } - - /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; - */ - public var mediaEvent: jellyfish.PeerNotifications.PeerMessage.MediaEvent - @JvmName("getMediaEvent") - get() = _builder.getMediaEvent() - - @JvmName("setMediaEvent") - set(value) { - _builder.setMediaEvent(value) - } - - /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; - */ - public fun clearMediaEvent() { - _builder.clearMediaEvent() - } - - /** - * .jellyfish.PeerMessage.MediaEvent media_event = 3; - * @return Whether the mediaEvent field is set. - */ - public fun hasMediaEvent(): kotlin.Boolean { - return _builder.hasMediaEvent() - } - public val contentCase: jellyfish.PeerNotifications.PeerMessage.ContentCase - @JvmName("getContentCase") - get() = _builder.getContentCase() - - public fun clearContent() { - _builder.clearContent() - } - } - - @kotlin.jvm.JvmName("-initializeauthenticated") - public inline fun authenticated(block: jellyfish.PeerMessageKt.AuthenticatedKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.Authenticated = - jellyfish.PeerMessageKt.AuthenticatedKt.Dsl._create(jellyfish.PeerNotifications.PeerMessage.Authenticated.newBuilder()).apply { block() }._build() - public object AuthenticatedKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - public class Dsl private constructor( - private val _builder: jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder, - ) { - public companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: jellyfish.PeerNotifications.PeerMessage.Authenticated.Builder): Dsl = Dsl(builder) - } - - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): jellyfish.PeerNotifications.PeerMessage.Authenticated = _builder.build() - } - } - - @kotlin.jvm.JvmName("-initializeauthRequest") - public inline fun authRequest(block: jellyfish.PeerMessageKt.AuthRequestKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.AuthRequest = - jellyfish.PeerMessageKt.AuthRequestKt.Dsl._create(jellyfish.PeerNotifications.PeerMessage.AuthRequest.newBuilder()).apply { block() }._build() - public object AuthRequestKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - public class Dsl private constructor( - private val _builder: jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder, - ) { - public companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: jellyfish.PeerNotifications.PeerMessage.AuthRequest.Builder): Dsl = Dsl(builder) - } - - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): jellyfish.PeerNotifications.PeerMessage.AuthRequest = _builder.build() - - /** - * string token = 1; - */ - public var token: kotlin.String - @JvmName("getToken") - get() = _builder.getToken() - - @JvmName("setToken") - set(value) { - _builder.setToken(value) - } - - /** - * string token = 1; - */ - public fun clearToken() { - _builder.clearToken() - } - } - } - - @kotlin.jvm.JvmName("-initializemediaEvent") - public inline fun mediaEvent(block: jellyfish.PeerMessageKt.MediaEventKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.MediaEvent = - jellyfish.PeerMessageKt.MediaEventKt.Dsl._create(jellyfish.PeerNotifications.PeerMessage.MediaEvent.newBuilder()).apply { block() }._build() - public object MediaEventKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - public class Dsl private constructor( - private val _builder: jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder, - ) { - public companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: jellyfish.PeerNotifications.PeerMessage.MediaEvent.Builder): Dsl = Dsl(builder) - } - - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): jellyfish.PeerNotifications.PeerMessage.MediaEvent = _builder.build() - - /** - * string data = 1; - */ - public var data: kotlin.String - @JvmName("getData") - get() = _builder.getData() - - @JvmName("setData") - set(value) { - _builder.setData(value) - } - - /** - * string data = 1; - */ - public fun clearData() { - _builder.clearData() - } - } - } -} - -@kotlin.jvm.JvmSynthetic -public inline fun jellyfish.PeerNotifications.PeerMessage.copy(block: jellyfish.PeerMessageKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage = - jellyfish.PeerMessageKt.Dsl._create(this.toBuilder()).apply { block() }._build() - -@kotlin.jvm.JvmSynthetic -public inline fun jellyfish.PeerNotifications.PeerMessage.Authenticated.copy(block: jellyfish.PeerMessageKt.AuthenticatedKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.Authenticated = - jellyfish.PeerMessageKt.AuthenticatedKt.Dsl._create(this.toBuilder()).apply { block() }._build() - -@kotlin.jvm.JvmSynthetic -public inline fun jellyfish.PeerNotifications.PeerMessage.AuthRequest.copy(block: jellyfish.PeerMessageKt.AuthRequestKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.AuthRequest = - jellyfish.PeerMessageKt.AuthRequestKt.Dsl._create(this.toBuilder()).apply { block() }._build() - -@kotlin.jvm.JvmSynthetic -public inline fun jellyfish.PeerNotifications.PeerMessage.MediaEvent.copy(block: jellyfish.PeerMessageKt.MediaEventKt.Dsl.() -> kotlin.Unit): jellyfish.PeerNotifications.PeerMessage.MediaEvent = - jellyfish.PeerMessageKt.MediaEventKt.Dsl._create(this.toBuilder()).apply { block() }._build() - -public val jellyfish.PeerNotifications.PeerMessageOrBuilder.authenticatedOrNull: jellyfish.PeerNotifications.PeerMessage.Authenticated? - get() = if (hasAuthenticated()) getAuthenticated() else null - -public val jellyfish.PeerNotifications.PeerMessageOrBuilder.authRequestOrNull: jellyfish.PeerNotifications.PeerMessage.AuthRequest? - get() = if (hasAuthRequest()) getAuthRequest() else null - -public val jellyfish.PeerNotifications.PeerMessageOrBuilder.mediaEventOrNull: jellyfish.PeerNotifications.PeerMessage.MediaEvent? - get() = if (hasMediaEvent()) getMediaEvent() else null diff --git a/JellyfishClient/src/main/java/jellyfish/PeerNotificationsKt.kt b/JellyfishClient/src/main/java/jellyfish/PeerNotificationsKt.kt deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md index 2ad0910..4bd21b3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Add the dependency: ```gradle dependencies { - implementation 'com.github.jellyfish-dev:android-client-sdk:<>' + implementation 'com.github.fishjam-dev:android-client-sdk:<>' } ``` diff --git a/app/build.gradle b/app/build.gradle index 716e646..5ff89f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ plugins { } android { - namespace 'com.example.jellyfishandroidexample' + namespace 'com.example.fishjamandroidexample' compileSdk 33 defaultConfig { - applicationId "com.example.jellyfishandroidexample" + applicationId "com.example.fishjamandroidexample" minSdk 24 targetSdk 33 versionCode 1 @@ -65,7 +65,7 @@ dependencies { implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' - implementation project(path: ':JellyfishClient') + implementation project(path: ':FishjamClient') implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'com.google.accompanist:accompanist-permissions:0.23.1' implementation 'com.jakewharton.timber:timber:5.0.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 063ee0d..eba6f96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,19 +10,19 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.JellyfishAndroidExample" + android:theme="@style/Theme.FishjamAndroidExample" android:usesCleartextTraffic="true" tools:targetApi="31"> + android:theme="@style/Theme.FishjamAndroidExample" /> + android:theme="@style/Theme.FishjamAndroidExample"> diff --git a/app/src/main/java/com/example/jellyfishandroidexample/MainActivity.kt b/app/src/main/java/com/example/fishjamandroidexample/MainActivity.kt similarity index 97% rename from app/src/main/java/com/example/jellyfishandroidexample/MainActivity.kt rename to app/src/main/java/com/example/fishjamandroidexample/MainActivity.kt index c1cc89a..d7af8ea 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/MainActivity.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample +package com.example.fishjamandroidexample import android.Manifest import android.content.Intent @@ -29,7 +29,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.example.jellyfishandroidexample.ui.theme.JellyfishAndroidExampleTheme +import com.example.fishjamandroidexample.ui.theme.FishjamAndroidExampleTheme import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState @@ -38,7 +38,7 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - JellyfishAndroidExampleTheme { + FishjamAndroidExampleTheme { MainContent() } } diff --git a/app/src/main/java/com/example/jellyfishandroidexample/Participant.kt b/app/src/main/java/com/example/fishjamandroidexample/Participant.kt similarity index 75% rename from app/src/main/java/com/example/jellyfishandroidexample/Participant.kt rename to app/src/main/java/com/example/fishjamandroidexample/Participant.kt index 087aebc..325a7c5 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/Participant.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/Participant.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample +package com.example.fishjamandroidexample import org.membraneframework.rtc.media.VideoTrack diff --git a/app/src/main/java/com/example/jellyfishandroidexample/ParticipantVideoView.kt b/app/src/main/java/com/example/fishjamandroidexample/ParticipantVideoView.kt similarity index 98% rename from app/src/main/java/com/example/jellyfishandroidexample/ParticipantVideoView.kt rename to app/src/main/java/com/example/fishjamandroidexample/ParticipantVideoView.kt index 04aa3c5..07ba44a 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/ParticipantVideoView.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/ParticipantVideoView.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample +package com.example.fishjamandroidexample import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/app/src/main/java/com/example/jellyfishandroidexample/RoomActivity.kt b/app/src/main/java/com/example/fishjamandroidexample/RoomActivity.kt similarity index 96% rename from app/src/main/java/com/example/jellyfishandroidexample/RoomActivity.kt rename to app/src/main/java/com/example/fishjamandroidexample/RoomActivity.kt index 32f264f..9c23075 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/RoomActivity.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/RoomActivity.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample +package com.example.fishjamandroidexample import android.annotation.SuppressLint import android.os.Bundle @@ -32,7 +32,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Size import androidx.compose.ui.unit.dp -import com.example.jellyfishandroidexample.ui.theme.JellyfishAndroidExampleTheme +import com.example.fishjamandroidexample.ui.theme.FishjamAndroidExampleTheme import kotlinx.parcelize.Parcelize class RoomActivity : ComponentActivity() { @@ -53,7 +53,7 @@ class RoomActivity : ComponentActivity() { viewModel.connect(roomToken) setContent { - JellyfishAndroidExampleTheme { + FishjamAndroidExampleTheme { // A surface container using the 'background' color from the theme Surface( modifier = Modifier.fillMaxSize(), diff --git a/app/src/main/java/com/example/jellyfishandroidexample/RoomViewModel.kt b/app/src/main/java/com/example/fishjamandroidexample/RoomViewModel.kt similarity index 90% rename from app/src/main/java/com/example/jellyfishandroidexample/RoomViewModel.kt rename to app/src/main/java/com/example/fishjamandroidexample/RoomViewModel.kt index d4e4b04..33c5cdd 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/RoomViewModel.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/RoomViewModel.kt @@ -1,13 +1,13 @@ -package com.example.jellyfishandroidexample +package com.example.fishjamandroidexample import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.jellyfishdev.jellyfishclient.Config -import com.jellyfishdev.jellyfishclient.JellyfishClient -import com.jellyfishdev.jellyfishclient.JellyfishClientListener -import com.jellyfishdev.jellyfishclient.Peer -import com.jellyfishdev.jellyfishclient.TrackContext +import com.fishjam.client.Config +import com.fishjam.client.FishjamClient +import com.fishjam.client.FishjamClientListener +import com.fishjam.client.Peer +import com.fishjam.client.TrackContext import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import org.membraneframework.rtc.SimulcastConfig @@ -17,8 +17,8 @@ import org.membraneframework.rtc.media.VideoParameters class RoomViewModel(application: Application) : AndroidViewModel(application), - JellyfishClientListener { - private val client = JellyfishClient(getApplication(), this) + FishjamClientListener { + private val client = FishjamClient(getApplication(), this) private var localVideoTrack: LocalVideoTrack? = null private val mutableParticipants = HashMap() diff --git a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Color.kt b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Color.kt similarity index 82% rename from app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Color.kt rename to app/src/main/java/com/example/fishjamandroidexample/ui/theme/Color.kt index e8b9a04..29d2b96 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Color.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample.ui.theme +package com.example.fishjamandroidexample.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Theme.kt b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Theme.kt similarity index 96% rename from app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Theme.kt rename to app/src/main/java/com/example/fishjamandroidexample/ui/theme/Theme.kt index c963b54..4f9c150 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Theme.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample.ui.theme +package com.example.fishjamandroidexample.ui.theme import android.app.Activity import android.os.Build @@ -38,7 +38,7 @@ private val LightColorScheme = lightColorScheme( ) @Composable -fun JellyfishAndroidExampleTheme( +fun FishjamAndroidExampleTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, diff --git a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Type.kt b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Type.kt similarity index 94% rename from app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Type.kt rename to app/src/main/java/com/example/fishjamandroidexample/ui/theme/Type.kt index 04e23ef..2db9672 100644 --- a/app/src/main/java/com/example/jellyfishandroidexample/ui/theme/Type.kt +++ b/app/src/main/java/com/example/fishjamandroidexample/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.example.jellyfishandroidexample.ui.theme +package com.example.fishjamandroidexample.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ce0ceb..118a233 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - JellyfishAndroidExample + FishjamAndroidExample RoomActivity \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1d79159..5f72dc0 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,4 @@ - -