Skip to content

Commit ba58307

Browse files
committed
Fix scheduled messages accessibility
1 parent d6a0684 commit ba58307

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

Telegram/Controls/Messages/MessageBubble.xaml.cs

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -393,22 +393,37 @@ public string GetAutomationName()
393393
builder.Append($"{Strings.EditedMessage}, ");
394394
}
395395

396-
var date = string.Format(Strings.TodayAtFormatted, Formatter.Time(message.Date));
397-
if (message.IsOutgoing)
396+
if (message.SendingState is MessageSendingStatePending)
398397
{
399-
if (message.SendingState is MessageSendingStatePending)
398+
builder.Append(Strings.AccDescrMsgSending);
399+
}
400+
else
401+
{
402+
if (message.SchedulingState is MessageSchedulingStateSendAtDate sendAtDate)
403+
{
404+
builder.Append(string.Format(Strings.MessageScheduledOn, Formatter.Time(sendAtDate.SendDate)));
405+
}
406+
else if (message.SchedulingState is MessageSchedulingStateSendWhenVideoProcessed sendWhenVideoProcessed)
407+
{
408+
builder.Append(string.Format(Strings.MessageScheduledOn, string.Format(Strings.ScheduledTimeApprox, Formatter.Time(sendWhenVideoProcessed.SendDate))));
409+
}
410+
else if (message.SchedulingState is MessageSchedulingStateSendWhenOnline)
400411
{
401-
builder.Append(Strings.AccDescrMsgSending);
412+
builder.Append(Strings.MessageScheduledUntilOnline);
402413
}
403414
else
404415
{
405-
builder.Append(string.Format(Strings.AccDescrSentDate, date));
416+
var date = string.Format(Strings.TodayAtFormatted, Formatter.Time(message.Date));
417+
if (message.IsOutgoing)
418+
{
419+
builder.Append(string.Format(Strings.AccDescrSentDate, date));
420+
}
421+
else
422+
{
423+
builder.Append(string.Format(Strings.AccDescrReceivedDate, date));
424+
}
406425
}
407426
}
408-
else
409-
{
410-
builder.Append(string.Format(Strings.AccDescrReceivedDate, date));
411-
}
412427

413428
if (message.SendingState is MessageSendingStateFailed)
414429
{

Telegram/Controls/Messages/MessageFooter.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ private void ToolTip_Opened(object sender, RoutedEventArgs e)
519519

520520
text = string.Format(Strings.formatDateAtTime, date, time);
521521
}
522-
if (message.SchedulingState is MessageSchedulingStateSendWhenVideoProcessed sendWhenVideoProcessed)
522+
else if (message.SchedulingState is MessageSchedulingStateSendWhenVideoProcessed sendWhenVideoProcessed)
523523
{
524524
text = Strings.VideoConversionTimeInfo;
525525
}

0 commit comments

Comments
 (0)