From b7c944fac11f6a975ec230e7e060d6f52591d7d2 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 13 Feb 2018 21:39:57 +0100
Subject: Remove crypto and timefactory from UsersController

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 settings/Controller/UsersController.php | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'settings/Controller')

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index f92f073e879..d311b9dcb80 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -45,7 +45,6 @@ use OC\Security\IdentityProof\Manager;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Encryption\IEncryptionModule;
@@ -61,7 +60,6 @@ use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
 use OCP\IAvatarManager;
-use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
 use OCP\Util;
 use OC\Settings\BackgroundJobs\VerifyUserData;
@@ -100,10 +98,6 @@ class UsersController extends Controller {
 	private $secureRandom;
 	/** @var NewUserMailHelper */
 	private $newUserMailHelper;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var ICrypto */
-	private $crypto;
 	/** @var Manager */
 	private $keyManager;
 	/** @var IJobList */
@@ -133,8 +127,6 @@ class UsersController extends Controller {
 	 * @param AccountManager $accountManager
 	 * @param ISecureRandom $secureRandom
 	 * @param NewUserMailHelper $newUserMailHelper
-	 * @param ITimeFactory $timeFactory
-	 * @param ICrypto $crypto
 	 * @param Manager $keyManager
 	 * @param IJobList $jobList
 	 * @param IUserMountCache $userMountCache
@@ -156,8 +148,6 @@ class UsersController extends Controller {
 								AccountManager $accountManager,
 								ISecureRandom $secureRandom,
 								NewUserMailHelper $newUserMailHelper,
-								ITimeFactory $timeFactory,
-								ICrypto $crypto,
 								Manager $keyManager,
 								IJobList $jobList,
 								IUserMountCache $userMountCache,
@@ -176,8 +166,6 @@ class UsersController extends Controller {
 		$this->accountManager = $accountManager;
 		$this->secureRandom = $secureRandom;
 		$this->newUserMailHelper = $newUserMailHelper;
-		$this->timeFactory = $timeFactory;
-		$this->crypto = $crypto;
 		$this->keyManager = $keyManager;
 		$this->jobList = $jobList;
 		$this->userMountCache = $userMountCache;
-- 
cgit v1.2.3


From d18d323f214face6d2b6c3dae54a2dd3f086550b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 13 Feb 2018 21:40:38 +0100
Subject: Remove fromMailAddress from MailSettingsController

Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 lib/private/AppFramework/DependencyInjection/DIContainer.php | 4 ----
 settings/Controller/MailSettingsController.php               | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'settings/Controller')

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 5fe925c2998..44c268bdea6 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -152,10 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $c->query('ServerContainer')->getWebRoot();
 		});
 
-		$this->registerService('fromMailAddress', function() {
-			return Util::getDefaultEmailAddress('no-reply');
-		});
-
 		$this->registerService('OC_Defaults', function ($c) {
 			return $c->getServer()->getThemingDefaults();
 		});
diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
index 22e2662a216..d1ceb14a63c 100644
--- a/settings/Controller/MailSettingsController.php
+++ b/settings/Controller/MailSettingsController.php
@@ -47,8 +47,6 @@ class MailSettingsController extends Controller {
 	private $userSession;
 	/** @var IMailer */
 	private $mailer;
-	/** @var string */
-	private $defaultMailAddress;
 
 	/**
 	 * @param string $appName
@@ -57,21 +55,18 @@ class MailSettingsController extends Controller {
 	 * @param IConfig $config
 	 * @param IUserSession $userSession
 	 * @param IMailer $mailer
-	 * @param string $fromMailAddress
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								IL10N $l10n,
 								IConfig $config,
 								IUserSession $userSession,
-								IMailer $mailer,
-								$fromMailAddress) {
+								IMailer $mailer) {
 		parent::__construct($appName, $request);
 		$this->l10n = $l10n;
 		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->mailer = $mailer;
-		$this->defaultMailAddress = $fromMailAddress;
 	}
 
 	/**
-- 
cgit v1.2.3