Use proper methods for checkPasswordProtectedShare

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

3 files changed, 2 insertions, 13 deletions

diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 52b382e6678..57e5742077b 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -283,7 +283,7 @@ class Share extends Constants {
 		}
 
 		// password protected shares need to be authenticated
-		if ($checkPasswordProtection && !\OCP\Share::checkPasswordProtectedShare($row)) {
+		if ($checkPasswordProtection && !\OC\Share\Share::checkPasswordProtectedShare($row)) {
 			return false;
 		}
 
diff --git a/lib/public/Share.php b/lib/public/Share.php
index bc07ce4b78c..0937fc6ae9f 100644
--- a/lib/public/Share.php
+++ b/lib/public/Share.php
@@ -235,15 +235,4 @@ class Share extends \OC\Share\Constants {
 	public static function getBackend($itemType) {
 		return \OC\Share\Share::getBackend($itemType);
 	}
-
-	/**
-	 * In case a password protected link is not yet authenticated this function will return false
-	 *
-	 * @param array $linkItem
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public static function checkPasswordProtectedShare(array $linkItem) {
-		return \OC\Share\Share::checkPasswordProtectedShare($linkItem);
-	}
 }
diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
index 0442e06fc45..cf4c553c536 100644
--- a/tests/lib/Share/ShareTest.php
+++ b/tests/lib/Share/ShareTest.php
@@ -501,7 +501,7 @@ class ShareTest extends \Test\TestCase {
 	 */
 	public function testCheckPasswordProtectedShare($expected, $item) {
 		\OC::$server->getSession()->set('public_link_authenticated', '100');
-		$result = \OCP\Share::checkPasswordProtectedShare($item);
+		$result = \OC\Share\Share::checkPasswordProtectedShare($item);
 		$this->assertEquals($expected, $result);
 	}