From f71ec5517058ad177350c22aa28cfaed346b4d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 25 Jun 2019 11:10:29 +0200 Subject: [PATCH] android: add ability to keep track of the current ongoing conference --- .../org/jitsi/meet/sdk/ExternalAPIModule.java | 3 + .../java/org/jitsi/meet/sdk/JitsiMeet.java | 9 +++ .../org/jitsi/meet/sdk/JitsiMeetView.java | 48 +++++------- .../meet/sdk/OngoingConferenceTracker.java | 73 +++++++++++++++++++ 4 files changed, 105 insertions(+), 28 deletions(-) create mode 100644 android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java index 5a616b188..9629b31ba 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java @@ -67,6 +67,9 @@ class ExternalAPIModule */ @ReactMethod public void sendEvent(String name, ReadableMap data, String scope) { + // Keep track of the current ongoing conference. + OngoingConferenceTracker.onExternalAPIEvent(name, data); + // The JavaScript App needs to provide uniquely identifying information // to the native ExternalAPI module so that the latter may match the // former to the native BaseReactView which hosts it. diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java index b975d70b4..68267f1c8 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java @@ -36,6 +36,15 @@ public class JitsiMeet { defaultConferenceOptions = options; } + /** + * Returns the current conference URL as a string. + * + * @return the current conference URL. + */ + public static String getCurrentConference() { + return OngoingConferenceTracker.getCurrentConference(); + } + /** * Helper to get the default conference options as a {@link Bundle}. * diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java index 187d68db0..d9fb4e79c 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java @@ -29,7 +29,8 @@ import java.lang.reflect.Method; import java.util.Map; -public class JitsiMeetView extends BaseReactView { +public class JitsiMeetView extends BaseReactView + implements OngoingConferenceTracker.OngoingConferenceListener { /** * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e. @@ -106,6 +107,14 @@ public class JitsiMeetView extends BaseReactView { if (!(context instanceof JitsiMeetActivityInterface)) { throw new RuntimeException("Enclosing Activity must implement JitsiMeetActivityInterface"); } + + OngoingConferenceTracker.addListener(this); + } + + @Override + public void dispose() { + OngoingConferenceTracker.removeListener(this); + super.dispose(); } /** @@ -173,27 +182,17 @@ public class JitsiMeetView extends BaseReactView { } /** - * The internal processing for the URL of the current conference set on the - * associated {@link JitsiMeetView}. - * - * @param eventName the name of the external API event to be processed - * @param eventData the details/specifics of the event to process determined - * by/associated with the specified {@code eventName}. + * Handler for {@link OngoingConferenceTracker} events. + * @param conferenceUrl */ - private void maybeSetViewURL(String eventName, ReadableMap eventData) { - String url = eventData.hasKey("url") ? eventData.getString("url") : null; - - switch(eventName) { - case "CONFERENCE_WILL_JOIN": - this.url = url; - break; - - case "CONFERENCE_TERMINATED": - if (url != null && url.equals(this.url)) { - this.url = null; - } - break; - } + @Override + public void onCurrentConferenceChanged(String conferenceUrl) { + // This property was introduced in order to address + // an exception in the Picture-in-Picture functionality which arose + // because of delays related to bridging between JavaScript and Java. To + // reduce these delays do not wait for the call to be transferred to the + // UI thread. + this.url = conferenceUrl; } /** @@ -205,13 +204,6 @@ public class JitsiMeetView extends BaseReactView { */ @Override protected void onExternalAPIEvent(String name, ReadableMap data) { - // XXX The JitsiMeetView property URL was introduced in order to address - // an exception in the Picture-in-Picture functionality which arose - // because of delays related to bridging between JavaScript and Java. To - // reduce these delays do not wait for the call to be transferred to the - // UI thread. - maybeSetViewURL(name, data); - onExternalAPIEvent(LISTENER_METHODS, name, data); } } diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java new file mode 100644 index 000000000..ab0a1ce07 --- /dev/null +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java @@ -0,0 +1,73 @@ +/* + * Copyright @ 2019-present 8x8, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jitsi.meet.sdk; + +import com.facebook.react.bridge.ReadableMap; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; + +class OngoingConferenceTracker { + private static final Collection listeners = + Collections.synchronizedSet(new HashSet()); + private static String currentConference; + + static synchronized String getCurrentConference() { + return currentConference; + } + + static synchronized void onExternalAPIEvent(String name, ReadableMap data) { + if (!data.hasKey("url")) { + return; + } + + String url = data.getString("url"); + + switch(name) { + case "CONFERENCE_WILL_JOIN": + currentConference = url; + updateCurrentConference(); + break; + + case "CONFERENCE_TERMINATED": + if (currentConference != null && url.equals(currentConference)) { + currentConference = null; + updateCurrentConference(); + } + break; + } + } + + static void addListener(OngoingConferenceListener listener) { + listeners.add(listener); + } + + static void removeListener(OngoingConferenceListener listener) { + listeners.remove(listener); + } + + private static synchronized void updateCurrentConference() { + for (OngoingConferenceListener listener: listeners) { + listener.onCurrentConferenceChanged(currentConference); + } + } + + public interface OngoingConferenceListener { + void onCurrentConferenceChanged(String conferenceUrl); + } +}