summaryrefslogtreecommitdiffstats
path: root/apps/federation/backgroundjob
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2016-02-26 16:59:53 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2016-02-29 16:50:33 +0100
commit7189c72c33a03d57473f7e3443193d07bece7c15 (patch)
tree8b61c06e4006f2426037e92d1d65008d6976022c /apps/federation/backgroundjob
parenteccd7cf6548e1ea639aea48cbf7e52e95dc98c11 (diff)
downloadnextcloud-server-7189c72c33a03d57473f7e3443193d07bece7c15.tar.gz
nextcloud-server-7189c72c33a03d57473f7e3443193d07bece7c15.zip
remove remote address book if the admin removes the server from the trusted servers list
Diffstat (limited to 'apps/federation/backgroundjob')
-rw-r--r--apps/federation/backgroundjob/getsharedsecret.php13
-rw-r--r--apps/federation/backgroundjob/requestsharedsecret.php3
2 files changed, 9 insertions, 7 deletions
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index ebc106ba94e..f896076139d 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -91,12 +91,13 @@ class GetSharedSecret extends QueuedJob{
$this->trustedServers = $trustedServers;
} else {
$this->trustedServers = new TrustedServers(
- $this->dbHandler,
- \OC::$server->getHTTPClientService(),
- $this->logger,
- $this->jobList,
- \OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ $this->dbHandler,
+ \OC::$server->getHTTPClientService(),
+ $this->logger,
+ $this->jobList,
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()
);
}
}
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index 302711af27f..79b55fe4ee4 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -95,7 +95,8 @@ class RequestSharedSecret extends QueuedJob {
$this->logger,
$this->jobList,
\OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()
);
}
}