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 index d344bc294..34673d1a3 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java @@ -27,6 +27,9 @@ import java.util.HashSet; class OngoingConferenceTracker { private static final OngoingConferenceTracker instance = new OngoingConferenceTracker(); + private static final String CONFERENCE_WILL_JOIN = "CONFERENCE_WILL_JOIN"; + private static final String CONFERENCE_TERMINATED = "CONFERENCE_TERMINATED"; + private final Collection listeners = Collections.synchronizedSet(new HashSet()); private String currentConference; @@ -53,12 +56,12 @@ class OngoingConferenceTracker { } switch(name) { - case "CONFERENCE_WILL_JOIN": + case CONFERENCE_WILL_JOIN: currentConference = url; updateOnConferenceJoined(); break; - case "CONFERENCE_TERMINATED": + case CONFERENCE_TERMINATED: if (url.equals(currentConference)) { currentConference = null; updateOnConferenceTerminated(); diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java index d9eafa349..09fa35185 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java @@ -86,8 +86,8 @@ class OngoingNotification { builder .setCategory(NotificationCompat.CATEGORY_CALL) - .setContentTitle("Ongoing meeting") - .setContentText("You are currently in a meeting. Tap to return to it.") + .setContentTitle(context.getString(R.string.ongoing_notification_title)) + .setContentText(context.getString(R.string.ongoing_notification_text)) .setPriority(NotificationCompat.PRIORITY_DEFAULT) .setContentIntent(pendingIntent) .setOngoing(true) diff --git a/android/sdk/src/main/res/values/strings.xml b/android/sdk/src/main/res/values/strings.xml index c9d1ebcb9..3bd33c20e 100644 --- a/android/sdk/src/main/res/values/strings.xml +++ b/android/sdk/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ Jitsi Meet SDK + Ongoing meeting + You are currently in a meeting. Tap to return to it.