Cleanup, refactor and test new AvatarService

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 343201925..3ef9e3d81 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -23,12 +23,13 @@
 namespace OCA\Mail\AppInfo;
 
 use OCA\Mail\Contracts\IAttachmentService;
+use OCA\Mail\Contracts\IAvatarService;
 use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\Contracts\IMailTransmission;
 use OCA\Mail\Service\Attachment\AttachmentService;
+use OCA\Mail\Service\AvatarService;
 use OCA\Mail\Service\MailManager;
 use OCA\Mail\Service\MailTransmission;
-use OCA\Mail\Storage\AvatarStorage;
 use OCP\AppFramework\App;
 use OCP\Util;
 
@@ -46,6 +47,7 @@ class Application extends App {
 		$transport = $container->getServer()->getConfig()->getSystemValue('app.mail.transport', 'smtp');
 		$testSmtp = $transport === 'smtp';
 
+		$container->registerAlias(IAvatarService::class, AvatarService::class);
 		$container->registerAlias(IMailManager::class, MailManager::class);
 		$container->registerAlias(IAttachmentService::class, AttachmentService::class);
 		$container->registerAlias(IMailTransmission::class, MailTransmission::class);
@@ -62,9 +64,6 @@ class Application extends App {
 		$container->registerParameter("testSmtp", $testSmtp);
 		$container->registerParameter("referrer", isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null);
 		$container->registerParameter("hostname", Util::getServerHostName());
-
-		$container->registerService('avatarStorage', function($c) {
-			return new AvatarStorage();
-		});
 	}
+
 }