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 ef506999fc4fb750b81c0ad6714e2c53032b86d3..2a5cdcd995f14a709f2f263990c6342555af9960 100644 (file)
--- 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 847469d25fd2a2dd080e130c72761f02c7d784d0..97318dc79b3b1601db5cf04b53ce230dd2eef4a1 100644 (file)
--- 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 b31f60ce25f94f69220ce76c13c86958a1ce603e..627ab000b885ba739cf532c3a9ed8fa5d216d89f 100644 (file)
--- 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;