From ddb8a273cec74cdd5af896085e0d5984184a451c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= Date: Thu, 25 Aug 2022 23:16:22 +0200 Subject: [PATCH] treewide: Removed unused Yahoo imap engine This is not useful now we have autoconfig support --- .../accounts/accounts-editor-list-pane.vala | 4 -- src/client/accounts/accounts-editor-row.vala | 4 -- .../accounts-editor-servers-pane.vala | 1 - src/engine/api/geary-engine.vala | 11 +--- src/engine/api/geary-service-provider.vala | 7 --- .../yahoo/imap-engine-yahoo-account.vala | 60 ------------------- .../yahoo/imap-engine-yahoo-folder.vala | 13 ---- src/engine/meson.build | 2 - .../api/geary-account-information-test.vala | 8 --- 9 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala delete mode 100644 src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala diff --git a/src/client/accounts/accounts-editor-list-pane.vala b/src/client/accounts/accounts-editor-list-pane.vala index 2f0918d8..e7d71843 100644 --- a/src/client/accounts/accounts-editor-list-pane.vala +++ b/src/client/accounts/accounts-editor-list-pane.vala @@ -329,10 +329,6 @@ private class Accounts.AccountListRow : AccountRow { details = _("Outlook.com"); break; - case Geary.ServiceProvider.YAHOO: - details = _("Yahoo"); - break; - case Geary.ServiceProvider.OTHER: // no-op: Use the generated label break; diff --git a/src/client/accounts/accounts-editor-row.vala b/src/client/accounts/accounts-editor-row.vala index cca825ac..2f808466 100644 --- a/src/client/accounts/accounts-editor-row.vala +++ b/src/client/accounts/accounts-editor-row.vala @@ -283,10 +283,6 @@ internal class Accounts.ServiceProviderRow : label = _("Outlook.com"); break; - case Geary.ServiceProvider.YAHOO: - label = _("Yahoo"); - break; - case Geary.ServiceProvider.OTHER: label = other_type_label; break; diff --git a/src/client/accounts/accounts-editor-servers-pane.vala b/src/client/accounts/accounts-editor-servers-pane.vala index 558bc9bc..8bd9bde1 100644 --- a/src/client/accounts/accounts-editor-servers-pane.vala +++ b/src/client/accounts/accounts-editor-servers-pane.vala @@ -115,7 +115,6 @@ internal class Accounts.EditorServersPane : this.account, this.commands, this.op_cancellable ); switch (account.service_provider) { - case YAHOO: case OTHER: add_row(this.details_list, this.save_sent); break; diff --git a/src/engine/api/geary-engine.vala b/src/engine/api/geary-engine.vala index 69089c08..ab8b40d7 100644 --- a/src/engine/api/geary-engine.vala +++ b/src/engine/api/geary-engine.vala @@ -218,26 +218,17 @@ public class Geary.Engine : BaseObject { ); break; - case ServiceProvider.YAHOO: - account = new ImapEngine.YahooAccount( - config, local, incoming_remote, outgoing_remote - ); - break; - case ServiceProvider.OUTLOOK: account = new ImapEngine.OutlookAccount( config, local, incoming_remote, outgoing_remote ); break; - case ServiceProvider.OTHER: + default: account = new ImapEngine.OtherAccount( config, local, incoming_remote, outgoing_remote ); break; - - default: - assert_not_reached(); } config.notify["ordinal"].connect(on_account_ordinal_changed); diff --git a/src/engine/api/geary-service-provider.vala b/src/engine/api/geary-service-provider.vala index 517bc3a4..c61cba42 100644 --- a/src/engine/api/geary-service-provider.vala +++ b/src/engine/api/geary-service-provider.vala @@ -12,7 +12,6 @@ public enum Geary.ServiceProvider { GMAIL, - YAHOO, OUTLOOK, OTHER; @@ -34,9 +33,6 @@ public enum Geary.ServiceProvider { case GMAIL: ImapEngine.GmailAccount.setup_account(service); break; - case YAHOO: - ImapEngine.YahooAccount.setup_account(service); - break; case OUTLOOK: ImapEngine.OutlookAccount.setup_account(service); break; @@ -51,9 +47,6 @@ public enum Geary.ServiceProvider { case GMAIL: ImapEngine.GmailAccount.setup_service(service); break; - case YAHOO: - ImapEngine.YahooAccount.setup_service(service); - break; case OUTLOOK: ImapEngine.OutlookAccount.setup_service(service); break; diff --git a/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala b/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala deleted file mode 100644 index 6ee00323..00000000 --- a/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2016 Software Freedom Conservancy Inc. - * Copyright 2019 Michael Gratton - * - * This software is licensed under the GNU Lesser General Public License - * (version 2.1 or later). See the COPYING file in this distribution. - */ - -private class Geary.ImapEngine.YahooAccount : Geary.ImapEngine.GenericAccount { - - - public static void setup_account(AccountInformation account) { - // noop - } - - public static void setup_service(ServiceInformation service) { - switch (service.protocol) { - case Protocol.IMAP: - service.host = "imap.mail.yahoo.com"; - service.port = Imap.IMAP_TLS_PORT; - service.transport_security = TlsNegotiationMethod.TRANSPORT; - break; - - case Protocol.SMTP: - service.host = "smtp.mail.yahoo.com"; - service.port = Smtp.SUBMISSION_TLS_PORT; - service.transport_security = TlsNegotiationMethod.TRANSPORT; - break; - } - } - - - public YahooAccount(AccountInformation config, - ImapDB.Account local, - Endpoint incoming_remote, - Endpoint outgoing_remote) { - base(config, local, incoming_remote, outgoing_remote); - } - - protected override MinimalFolder new_folder(ImapDB.Folder local_folder) { - FolderPath path = local_folder.get_path(); - Folder.SpecialUse use = NONE; - if (Imap.MailboxSpecifier.folder_path_is_inbox(path)) { - use = INBOX; - } else { - // Despite Yahoo not advertising that it supports - // SPECIAL-USE via its CAPABILITIES, it lists the - // appropriate attributes in LIST results anyway, so we - // can just consult that. :| - use = local_folder.get_properties().attrs.get_special_use(); - // There can be only one Inbox - if (use == INBOX) { - use = NONE; - } - } - - return new YahooFolder(this, local_folder, use); - } - -} diff --git a/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala b/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala deleted file mode 100644 index 1a49466b..00000000 --- a/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright 2016 Software Freedom Conservancy Inc. - * - * This software is licensed under the GNU Lesser General Public License - * (version 2.1 or later). See the COPYING file in this distribution. - */ - -private class Geary.ImapEngine.YahooFolder : GenericFolder { - public YahooFolder(YahooAccount account, - ImapDB.Folder local_folder, - Folder.SpecialUse use) { - base (account, local_folder, use); - } -} diff --git a/src/engine/meson.build b/src/engine/meson.build index 7e4e6381..5efe081f 100644 --- a/src/engine/meson.build +++ b/src/engine/meson.build @@ -222,8 +222,6 @@ engine_vala_sources = files( 'imap-engine/replay-ops/imap-engine-replay-update.vala', 'imap-engine/replay-ops/imap-engine-server-search-email.vala', 'imap-engine/replay-ops/imap-engine-user-close.vala', - 'imap-engine/yahoo/imap-engine-yahoo-account.vala', - 'imap-engine/yahoo/imap-engine-yahoo-folder.vala', 'memory/memory-buffer.vala', 'memory/memory-byte-buffer.vala', diff --git a/test/engine/api/geary-account-information-test.vala b/test/engine/api/geary-account-information-test.vala index 44790273..aec0a6a7 100644 --- a/test/engine/api/geary-account-information-test.vala +++ b/test/engine/api/geary-account-information-test.vala @@ -41,14 +41,6 @@ class Geary.AccountInformationTest : TestCase { new RFC822.MailboxAddress(null, "test1@example.com") ).save_sent ); - assert_true( - new AccountInformation( - "test", - ServiceProvider.YAHOO, - new Mock.CredentialsMediator(), - new RFC822.MailboxAddress(null, "test1@example.com") - ).save_sent - ); } public void test_sender_mailboxes() throws GLib.Error {