From 237081e5735b463b7528f4f3f52978eaf1bfeeca Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 12 Oct 2021 16:27:56 +0200 Subject: Fix compiler warnings ('Switch does not handle .. of enum ..') --- crypto-vala/vapi/libsrtp2.vapi | 31 +++++++++++++++++++++- libdino/src/service/util.vala | 6 +++-- .../ui/conversation_content_view/file_widget.vala | 3 +++ main/src/ui/notifier_freedesktop.vala | 2 ++ plugins/omemo/src/ui/bad_messages_populator.vala | 2 ++ plugins/rtp/src/plugin.vala | 2 ++ xmpp-vala/src/module/xep/0045_muc/module.vala | 2 ++ 7 files changed, 45 insertions(+), 3 deletions(-) diff --git a/crypto-vala/vapi/libsrtp2.vapi b/crypto-vala/vapi/libsrtp2.vapi index 5ceedced..c0c50c1c 100644 --- a/crypto-vala/vapi/libsrtp2.vapi +++ b/crypto-vala/vapi/libsrtp2.vapi @@ -99,7 +99,36 @@ public enum SecurityServices { [CCode (cname = "srtp_err_status_t", cprefix = "srtp_err_status_", has_type_id = false)] public enum ErrorStatus { - ok, fail, bad_param, alloc_fail, dealloc_fail, init_fail, terminus, auth_fail, cipher_fail, replay_fail, algo_fail, no_such_op, no_ctx, cant_check, key_expired, socket_err, signal_err, nonce_bad, encode_err, semaphore_err, pfkey_err, bad_mki, pkt_idx_old, pkt_idx_adv + ok, + fail, + bad_param, + alloc_fail, + dealloc_fail, + init_fail, + terminus, + auth_fail, + cipher_fail, + replay_fail, + replay_old, + + algo_fail, + no_such_op, + no_ctx, + cant_check, + key_expired, + socket_err, + signal_err, + nonce_bad, + read_fail, + write_fail, + + parse_err, + encode_err, + semaphore_err, + pfkey_err, + bad_mki, + pkt_idx_old, + pkt_idx_adv } [CCode (cname = "srtp_log_level_t", cprefix = "srtp_log_level_", has_type_id = false)] diff --git a/libdino/src/service/util.vala b/libdino/src/service/util.vala index 4f9b94ce..3cbb48d9 100644 --- a/libdino/src/service/util.vala +++ b/libdino/src/service/util.vala @@ -11,8 +11,9 @@ public class Util { return Entities.Message.Type.GROUPCHAT; case Conversation.Type.GROUPCHAT_PM: return Entities.Message.Type.GROUPCHAT_PM; + default: + assert_not_reached(); } - assert_not_reached(); } public static Conversation.Type get_conversation_type_for_message(Message message) { @@ -23,8 +24,9 @@ public class Util { return Conversation.Type.GROUPCHAT; case Entities.Message.Type.GROUPCHAT_PM: return Conversation.Type.GROUPCHAT_PM; + default: + assert_not_reached(); } - assert_not_reached(); } } diff --git a/main/src/ui/conversation_content_view/file_widget.vala b/main/src/ui/conversation_content_view/file_widget.vala index 7d77ba11..5766ec25 100644 --- a/main/src/ui/conversation_content_view/file_widget.vala +++ b/main/src/ui/conversation_content_view/file_widget.vala @@ -175,6 +175,9 @@ public class FileDefaultWidgetController : Object { assert(stream_interactor != null && file_transfer != null); stream_interactor.get_module(FileManager.IDENTITY).download_file.begin(file_transfer); break; + default: + // Clicking doesn't do anything in FAILED and IN_PROGRESS states + break; } return false; } diff --git a/main/src/ui/notifier_freedesktop.vala b/main/src/ui/notifier_freedesktop.vala index 634f331b..48313be3 100644 --- a/main/src/ui/notifier_freedesktop.vala +++ b/main/src/ui/notifier_freedesktop.vala @@ -200,6 +200,8 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object { case ConnectionManager.ConnectionError.Source.TLS: body = _("Invalid TLS certificate"); break; + default: + break; } HashTable hash_table = new HashTable(null, null); diff --git a/plugins/omemo/src/ui/bad_messages_populator.vala b/plugins/omemo/src/ui/bad_messages_populator.vala index 7b36c103..bd2474f2 100644 --- a/plugins/omemo/src/ui/bad_messages_populator.vala +++ b/plugins/omemo/src/ui/bad_messages_populator.vala @@ -69,6 +69,8 @@ public class BadMessagesPopulator : Plugins.ConversationItemPopulator, Plugins.C selection.append(")"); qry.where(selection.str, selection_args); break; + case Conversation.Type.GROUPCHAT_PM: + break; } foreach (Row row in qry) { diff --git a/plugins/rtp/src/plugin.vala b/plugins/rtp/src/plugin.vala index 19a266b1..d79fc2aa 100644 --- a/plugins/rtp/src/plugin.vala +++ b/plugins/rtp/src/plugin.vala @@ -206,6 +206,8 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object { old = devices.first_match((it) => it.matches(device)); if (old != null) devices.remove(old); break; + default: + break; } if (device != null) { switch (device.device_class) { diff --git a/xmpp-vala/src/module/xep/0045_muc/module.vala b/xmpp-vala/src/module/xep/0045_muc/module.vala index 718ad255..4cab9b6a 100644 --- a/xmpp-vala/src/module/xep/0045_muc/module.vala +++ b/xmpp-vala/src/module/xep/0045_muc/module.vala @@ -193,6 +193,8 @@ public class Module : XmppStreamModule { case Affiliation.ADMIN: if (other_affiliation == Affiliation.OWNER) return false; break; + default: + return false; } return true; } catch (InvalidJidError e) { -- cgit v1.2.3-70-g09d2