Merge remote-tracking branch 'origin/stable15' into stable15

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Jun 8, 2019 · 462ad76 · 462ad76
2 parents dea8d36 + 07540bf
commit 462ad76
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/lib/Service/IndexService.php b/lib/Service/IndexService.php
@@ -206,7 +206,7 @@ public function indexProviderContentFromUser(
 	private function updateDocumentsWithCurrIndex(
 		IFullTextSearchProvider $provider, array $documents, IIndexOptions $options
 	): array {
-		$currIndex = $this->getProviderIndexFromProvider($provider->getId());
+
 		$result = [];
 		$count = 0;
 		foreach ($documents as $document) {
@@ -218,7 +218,8 @@ private function updateDocumentsWithCurrIndex(
 			$count++;
 
 			try {
-				$index = $currIndex->getIndex($document->getId());
+				$index =
+					$this->indexesRequest->getIndex($document->getProviderId(), $document->getId());
 			} catch (IndexDoesNotExistException $e) {
 				$index = new Index($document->getProviderId(), $document->getId());
 				$index->setStatus(Index::INDEX_FULL);
@@ -267,18 +268,6 @@ private function isDocumentUpToDate(IFullTextSearchProvider $provider, IndexDocu
 	}
 
 
-	/**
-	 * @param string $providerId
-	 *
-	 * @return ProviderIndexes
-	 */
-	private function getProviderIndexFromProvider(string $providerId): ProviderIndexes {
-		$indexes = $this->indexesRequest->getIndexesFromProvider($providerId);
-
-		return new ProviderIndexes($indexes);
-	}
-
-
 	/**
 	 * @param IFullTextSearchPlatform $platform
 	 * @param IFullTextSearchProvider $provider