Skip to content

Commit 0fd0abc

Browse files
committed
add handling of BUSY webrtc call status
1 parent fbfc5fb commit 0fd0abc

14 files changed

Lines changed: 22 additions & 5 deletions

File tree

app/src/main/java/co/tinode/tindroid/format/AbstractDraftyFormatter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,11 @@ protected static StringBuilder millisToTime(@NonNull Number millis, boolean fixe
198198
}
199199

200200
protected static int callStatus(boolean incoming, String event) {
201-
int comment = 0;
201+
int comment;
202202
switch (event) {
203+
case "busy":
204+
comment = R.string.busy_call;
205+
break;
203206
case "declined":
204207
comment = R.string.declined_call;
205208
break;

app/src/main/java/co/tinode/tindroid/format/FullFormatter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,8 @@ protected SpannableStringBuilder handleVideoCall(final Context ctx, List<Spannab
799799
result.append("\n");
800800

801801
SpannableStringBuilder second = new SpannableStringBuilder();
802-
boolean success = !Arrays.asList("declined", "disconnected", "missed").contains(state);
802+
boolean success = !Arrays.asList("busy", "declined", "disconnected", "missed")
803+
.contains(state);
803804
icon = AppCompatResources.getDrawable(ctx,
804805
incoming ?
805806
(success ? R.drawable.ic_arrow_sw : R.drawable.ic_arrow_missed) :

app/src/main/java/co/tinode/tindroid/format/PreviewFormatter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ protected SpannableStringBuilder handleVideoCall(Context ctx, List<SpannableStri
193193
int duration = getIntVal("duration", data);
194194
String state = getStringVal("state", data, "");
195195

196-
boolean success = !Arrays.asList("declined", "disconnected", "missed").contains(state);
196+
boolean success = !Arrays.asList("busy", "declined", "disconnected", "missed")
197+
.contains(state);
197198
String status = " " + (duration > 0 ?
198199
millisToTime(duration, false).toString() :
199200
ctx.getString(callStatus(incoming, state)));

app/src/main/java/co/tinode/tindroid/services/FBaseMessagingService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,11 @@ private void handleCallNotification(@NonNull String webrtc, boolean isMe, @NonNu
341341
// The server notifies us of the call that we've already accepted. Do nothing.
342342
return;
343343
}
344-
case "missed":
344+
case "busy":
345345
case "declined":
346346
case "disconnected":
347347
case "finished":
348+
case "missed":
348349
if (origSeq > 0) {
349350
// Dismiss the call UI.
350351
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,5 @@
344344
<string name="action_call">Anruf</string>
345345
<string name="unable_to_place_call">Dieser Anruf kann nicht getätigt werden</string>
346346
<string name="unable_to_answer_call">Dieser Anruf kann nicht entgegengenommen werden</string>
347+
<string name="busy_call">besetzt</string>
347348
</resources>

app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,5 @@
341341
<string name="action_call">Llamar</string>
342342
<string name="unable_to_place_call">No se pudo realizar esta llamada</string>
343343
<string name="unable_to_answer_call">No se pudo responder esta llamada</string>
344+
<string name="busy_call">ocupada</string>
344345
</resources>

app/src/main/res/values-fr/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,4 +342,5 @@
342342
<string name="action_call">Appeler</string>
343343
<string name="unable_to_place_call">Impossible de passer cet appel</string>
344344
<string name="unable_to_answer_call">Impossible de répondre à cet appel</string>
345+
<string name="busy_call">occupée</string>
345346
</resources>

app/src/main/res/values-ko/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,5 @@
341341
<string name="action_call">전화</string>
342342
<string name="unable_to_place_call">전화를 걸 수 없습니다</string>
343343
<string name="unable_to_answer_call">이 전화를 받을 수 없습니다</string>
344+
<string name="busy_call">바쁘다</string>
344345
</resources>

app/src/main/res/values-pt/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,4 +343,5 @@
343343
<string name="action_call">Chamar</string>
344344
<string name="unable_to_place_call">Não é possível fazer esta chamada</string>
345345
<string name="unable_to_answer_call">Não é possível atender esta chamada</string>
346+
<string name="busy_call">ocupada</string>
346347
</resources>

app/src/main/res/values-ru/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,4 +322,5 @@
322322
<string name="action_call">Позвонить</string>
323323
<string name="unable_to_place_call">Невозможно сделать этот звонок</string>
324324
<string name="unable_to_answer_call">Невозможно ответить на этот звонок</string>
325+
<string name="busy_call">занято</string>
325326
</resources>

0 commit comments

Comments
 (0)