From 0c9e4717a305315be617a44700ae118ded8ea5d1 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 2 Sep 2024 20:28:03 +0530 Subject: [PATCH] Remove IsExternal Signed-off-by: Akhil --- dev/Stores/User/App.js | 2 +- plugins/kolab/KolabAddressBook.php | 5 ----- plugins/nextcloud/NextcloudAddressBook.php | 5 ----- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 1 - .../v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php | 1 - .../v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php | 5 ----- .../RainLoop/Providers/AddressBook/AddressBookInterface.php | 2 -- .../RainLoop/Providers/AddressBook/PdoAddressBook.php | 5 ----- 8 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js index 0a8723c40..9825c8951 100644 --- a/dev/Stores/User/App.js +++ b/dev/Stores/User/App.js @@ -4,7 +4,7 @@ import { ThemeStore } from 'Stores/Theme'; import { arePopupsVisible } from 'Knoin/Knoin'; export const AppUserStore = { - allowContacts: () => !!SettingsGet('contactsAllowed') && !!SettingsGet('contactsExternal') + allowContacts: () => !!SettingsGet('contactsAllowed') }; addObservablesTo(AppUserStore, { diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php index 1e01b216a..8c7df9316 100644 --- a/plugins/kolab/KolabAddressBook.php +++ b/plugins/kolab/KolabAddressBook.php @@ -99,11 +99,6 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt return true; } - public function IsExternal(): bool - { - return false; - } - public function SetEmail(string $sEmail) : bool { return true; diff --git a/plugins/nextcloud/NextcloudAddressBook.php b/plugins/nextcloud/NextcloudAddressBook.php index 2790e4e5c..9c84e84ed 100644 --- a/plugins/nextcloud/NextcloudAddressBook.php +++ b/plugins/nextcloud/NextcloudAddressBook.php @@ -38,11 +38,6 @@ class NextcloudAddressBook implements \RainLoop\Providers\AddressBook\AddressBoo return true; } - public function IsExternal(): bool - { - return true; - } - public function SetEmail(string $sEmail) : bool { return true; } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 3ebb1de27..eb7356db5 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -678,7 +678,6 @@ class Actions 'accountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]), 'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(), - 'contactsExternal' => $this->AddressBookProvider($oAccount)->IsExternal(), 'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true), 'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php index 7c9724e7a..7316ddc2e 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php @@ -202,7 +202,6 @@ trait Accounts 'accountHash' => $oAccount->Hash(), 'mainEmail' => \RainLoop\Api::Actions()->getMainAccountFromToken()->Email(), 'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(), - 'contactsExternal' => $this->AddressBookProvider($oAccount)->IsExternal(), 'HideUnsubscribed' => false, 'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false), 'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php index 332836449..affaecd99 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php @@ -25,11 +25,6 @@ class AddressBook extends AbstractProvider return $this->oDriver && $this->oDriver->IsSupported(); } - public function IsExternal() : bool - { - return $this->IsActive() ? $this->oDriver->IsExternal() : false; - } - public function Sync() : bool { return $this->IsActive() ? $this->oDriver->Sync() : false; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php index 50d773244..564a0d48b 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php @@ -6,8 +6,6 @@ interface AddressBookInterface { public function IsSupported() : bool; - public function IsExternal() : bool; - public function SetEmail(string $sEmail) : bool; public function Sync() : bool; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php index 76af282f3..3c60f44f3 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php @@ -75,11 +75,6 @@ class PdoAddressBook $aDrivers = static::getAvailableDrivers(); return \is_array($aDrivers) && \in_array($this->settings->driver, $aDrivers); } - - public function IsExternal(): bool - { - return false; - } public function SetEmail(string $sEmail) : bool {