From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 31 Jul 2017 06:19:54 +0000 (+0200)
Subject: Disable default activity email for incoming shares
X-Git-Tag: v12.0.3RC1~87^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cf160875856446f7e86ea5e3bc5553b6048caf6d;p=nextcloud-server.git

Disable default activity email for incoming shares

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/apps/files_sharing/lib/Activity/Settings/RemoteShare.php b/apps/files_sharing/lib/Activity/Settings/RemoteShare.php
index ef506999fc4..2a5cdcd995f 100644
--- a/apps/files_sharing/lib/Activity/Settings/RemoteShare.php
+++ b/apps/files_sharing/lib/Activity/Settings/RemoteShare.php
@@ -92,7 +92,7 @@ class RemoteShare implements ISetting {
 	 * @since 11.0.0
 	 */
 	public function isDefaultEnabledMail() {
-		return true;
+		return false;
 	}
 }
 
diff --git a/apps/files_sharing/lib/Activity/Settings/Shared.php b/apps/files_sharing/lib/Activity/Settings/Shared.php
index 847469d25fd..97318dc79b3 100644
--- a/apps/files_sharing/lib/Activity/Settings/Shared.php
+++ b/apps/files_sharing/lib/Activity/Settings/Shared.php
@@ -92,7 +92,7 @@ class Shared implements ISetting {
 	 * @since 11.0.0
 	 */
 	public function isDefaultEnabledMail() {
-		return true;
+		return false;
 	}
 }
 
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index b31f60ce25f..627ab000b88 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -31,7 +31,6 @@ use OC\Cache\CappedMemoryCache;
 use OC\Files\Mount\MoveableMount;
 use OC\HintException;
 use OC\Share20\Exception\ProviderException;
-use OCP\Defaults;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
@@ -42,6 +41,7 @@ use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Mail\IMailer;
 use OCP\Security\IHasher;