cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Jul 11, 2020 · dacfcc7 · dacfcc7
1 parent bf82e57
commit dacfcc7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/lib/GlobalScale/FileShare.php b/lib/GlobalScale/FileShare.php
@@ -45,7 +45,6 @@
 use OCA\Circles\Model\SharingFrame;
 use OCA\Circles\Service\MiscService;
 use OCP\Files\NotFoundException;
-use OCP\IL10N;
 use OCP\IUser;
 use OCP\Mail\IEMailTemplate;
 use OCP\Share\Exceptions\IllegalIDChangeException;
@@ -65,10 +64,6 @@ class FileShare extends AGlobalScaleEvent {
 	use TArrayTools;
 
 
-	/** @var IL10N */
-	private $l10n;
-
-
 	/**
 	 * @param GSEvent $event
 	 * @param bool $localCheck

diff --git a/lib/Model/GlobalScale/GSEvent.php b/lib/Model/GlobalScale/GSEvent.php
@@ -402,6 +402,7 @@ public function import(array $data): self {
 		$this->setSource($this->get('source', $data));
 		$this->setKey($this->get('key', $data));
 		$this->setForced($this->getBool('force', $data));
+		$this->setAsync($this->getBool('async', $data));
 
 		if (array_key_exists('circle', $data)) {
 			$this->setCircle(Circle::fromArray($data['circle']));
@@ -430,7 +431,8 @@ function jsonSerialize(): array {
 			'result'   => $this->getResult(),
 			'key'      => $this->getKey(),
 			'source'   => $this->getSource(),
-			'force'    => $this->isForced()
+			'force'    => $this->isForced(),
+			'async'    => $this->isAsync()
 		];
 
 		if ($this->hasCircle()) {

diff --git a/lib/Search/GlobalScaleUsers.php b/lib/Search/GlobalScaleUsers.php
@@ -98,7 +98,7 @@ public function search($search) {
 		RequestServerException |
 		RequestResultNotJsonException $e
 		) {
-			$this->miscService->log('Issue while retrieving instances from lookup: ' . $e->getMessage());
+			$this->miscService->log('Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage());
 
 			return [];
 		}

diff --git a/lib/Service/GSDownstreamService.php b/lib/Service/GSDownstreamService.php
@@ -38,7 +38,6 @@
 use OCA\Circles\Exceptions\GlobalScaleDSyncException;
 use OCA\Circles\Exceptions\GlobalScaleEventException;
 use OCA\Circles\Exceptions\GSKeyException;
-use OCA\Circles\Exceptions\GSStatusException;
 use OCA\Circles\Model\GlobalScale\GSEvent;
 use OCP\IURLGenerator;
 
@@ -107,7 +106,6 @@ public function __construct(
 	 * @param GSEvent $event
 	 *
 	 * @throws GSKeyException
-	 * @throws GSStatusException
 	 * @throws GlobalScaleEventException
 	 * @throws CircleDoesNotExistException
 	 * @throws ConfigNoCircleAvailableException

diff --git a/lib/Service/GSUpstreamService.php b/lib/Service/GSUpstreamService.php
@@ -145,7 +145,7 @@ public function newEvent(GSEvent $event) {
 //				$gs->verify($event); // needed ? as we check event on the 'master' of the circle
 				$this->confirmEvent($event);
 				$this->miscService->log('confirmed: ' . json_encode($event));
-				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
+//				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(

diff --git a/lib/Service/GlobalScaleService.php b/lib/Service/GlobalScaleService.php
@@ -227,7 +227,7 @@ public function getInstances(bool $all = false): array {
 			try {
 				$instances = $this->retrieveJson($request);
 			} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
-				$this->miscService->log('Issue while retrieving instances from lookup: ' . $e->getMessage());
+				$this->miscService->log('Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage());
 
 				return [];
 			}