diff options
| author | fiaxh <git@lightrise.org> | 2018-12-29 19:15:25 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2018-12-31 16:49:22 +0100 |
| commit | 446e86d4ad798655aa1a83aebc86f9f2431484df (patch) | |
| tree | 85948047dcc223ad1ccf130f087fb8a2c2382a11 /main | |
| parent | 420942873a595415d09c9a48b9950c214e77008b (diff) | |
| download | dino-446e86d4ad798655aa1a83aebc86f9f2431484df.tar.gz dino-446e86d4ad798655aa1a83aebc86f9f2431484df.zip | |
Check FileTransfer's mime_type for null (unknown) when handeling it
fixes #479
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/ui/conversation_selector/conversation_row.vala | 5 | ||||
| -rw-r--r-- | main/src/ui/conversation_summary/content_item_widget_factory.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/notifications.vala | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index 88234006..2d41d044 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -150,10 +150,11 @@ public class ConversationRow : ListBoxRow { nick_label.label = transfer.direction == Message.DIRECTION_SENT ? _("Me") + ": " : ""; } + bool file_is_image = transfer.mime_type != null && transfer.mime_type.has_prefix("image"); if (transfer.direction == Message.DIRECTION_SENT) { - message_label.label = "<i>" + (transfer.mime_type.has_prefix("image") ? _("Image sent") : _("File sent") ) + "</i>"; + message_label.label = "<i>" + (file_is_image ? _("Image sent") : _("File sent") ) + "</i>"; } else { - message_label.label = "<i>" +(transfer.mime_type.has_prefix("image") ? _("Image received") : _("File received") ) + "</i>"; + message_label.label = "<i>" + (file_is_image ? _("Image received") : _("File received") ) + "</i>"; } break; } diff --git a/main/src/ui/conversation_summary/content_item_widget_factory.vala b/main/src/ui/conversation_summary/content_item_widget_factory.vala index d8d21ebd..4a625cc5 100644 --- a/main/src/ui/conversation_summary/content_item_widget_factory.vala +++ b/main/src/ui/conversation_summary/content_item_widget_factory.vala @@ -194,7 +194,7 @@ public class FileItemWidgetGenerator : WidgetGenerator, Object { private Widget getDefaultWidget(FileTransfer file_transfer) { Box main_box = new Box(Orientation.HORIZONTAL, 4) { halign=Align.START, visible=true }; - string? icon_name = ContentType.get_generic_icon_name(file_transfer.mime_type); + string? icon_name = file_transfer.mime_type != null ? ContentType.get_generic_icon_name(file_transfer.mime_type) : null; Image content_type_image = new Image.from_icon_name(icon_name, IconSize.DND) { visible=true }; main_box.add(content_type_image); diff --git a/main/src/ui/notifications.vala b/main/src/ui/notifications.vala index 77a290a0..277a7a09 100644 --- a/main/src/ui/notifications.vala +++ b/main/src/ui/notifications.vala @@ -62,10 +62,11 @@ public class Notifications : Object { FileItem file_item = content_item as FileItem; FileTransfer transfer = file_item.file_transfer; + bool file_is_image = transfer.mime_type != null && transfer.mime_type.has_prefix("image"); if (transfer.direction == Message.DIRECTION_SENT) { - text = transfer.mime_type.has_prefix("image") ? _("Image sent") : _("File sent"); + text = file_is_image ? _("Image sent") : _("File sent"); } else { - text = transfer.mime_type.has_prefix("image") ? _("Image received") : _("File received"); + text = file_is_image ? _("Image received") : _("File received"); } break; } |