Remove unused OC\Share\Share::checkPasswordProtectedShare

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

diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 424fe8a2382ad0433f9fd5cee16f113f7c67b2e0..86101707dbf612fd15dffd0e74ccc7bddce54c34 100644 (file)
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -1326,35 +1326,6 @@ class Share extends Constants {
 
        }
 
-       /**
-        * In case a password protected link is not yet authenticated this function will return false
-        *
-        * @param array $linkItem
-        * @return boolean
-        */
-       public static function checkPasswordProtectedShare(array $linkItem) {
-               if (!isset($linkItem['share_with'])) {
-                       return true;
-               }
-               if (!isset($linkItem['share_type'])) {
-                       return true;
-               }
-               if (!isset($linkItem['id'])) {
-                       return true;
-               }
-
-               if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) {
-                       return true;
-               }
-
-               if ( \OC::$server->getSession()->exists('public_link_authenticated')
-                       && \OC::$server->getSession()->get('public_link_authenticated') === (string)$linkItem['id'] ) {
-                       return true;
-               }
-
-               return false;
-       }
-
        /**
         * construct select statement
         * @param int $format

diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
index 4d3b48b7aa4451793c897cfff9a685afb7b5c19d..7db58d744d5e0a130788cd2a9cbd0a677ae640aa 100644 (file)
--- a/tests/lib/Share/ShareTest.php
+++ b/tests/lib/Share/ShareTest.php
@@ -222,35 +222,6 @@ class ShareTest extends \Test\TestCase {
                $this->assertEmpty($expected, 'did not found all expected values');
        }
 
-       /**
-        * @dataProvider checkPasswordProtectedShareDataProvider
-        * @param $expected
-        * @param $item
-        */
-       public function testCheckPasswordProtectedShare($expected, $item) {
-               \OC::$server->getSession()->set('public_link_authenticated', '100');
-               $result = \OC\Share\Share::checkPasswordProtectedShare($item);
-               $this->assertEquals($expected, $result);
-       }
-
-       function checkPasswordProtectedShareDataProvider() {
-               return array(
-                       array(true, array()),
-                       array(true, array('share_with' => null)),
-                       array(true, array('share_with' => '')),
-                       array(true, array('share_with' => '1234567890', 'share_type' => '1')),
-                       array(true, array('share_with' => '1234567890', 'share_type' => 1)),
-                       array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '100')),
-                       array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '100')),
-                       array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 100)),
-                       array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 100)),
-                       array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '101')),
-                       array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '101')),
-                       array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 101)),
-                       array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 101)),
-               );
-       }
-
        /**
         * @dataProvider urls
         * @param string $url