haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feedback pass 3

This commit is contained in:
Saúl Ibarra Corretgé 2019-06-26 10:20:18 +02:00
parent 17ae77344b
commit cc56dc6d5b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingConferenceTracker.java
View File

@ -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<OngoingConferenceListener> listeners =
Collections.synchronizedSet(new HashSet<OngoingConferenceListener>());
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();

4
android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
View File

@ -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)

2
android/sdk/src/main/res/values/strings.xml
View File

@ -1,4 +1,6 @@
<resources>
<string name="app_name">Jitsi Meet SDK</string>
<string name="dropbox_app_key"></string>
<string name="ongoing_notification_title">Ongoing meeting</string>
<string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
</resources>