userRecovery() was replaced by setRecoveryForUser()

diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 1a6cf18fbed9dba7b699afadd47fa1308b42f3e5..d4867f5fdaab7545468a0ee575ca1e5d6299f68f 100644 (file)
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -29,11 +29,6 @@ namespace OCA\Encryption\AppInfo;
                'url' => '/ajax/adminRecovery',
                'verb' => 'POST'
        ],
-       [
-               'name' => 'Recovery#userRecovery',
-               'url' => '/ajax/userRecovery',
-               'verb' => 'POST'
-       ],
        [
                'name' => 'Recovery#changeRecoveryPassword',
                'url' => '/ajax/changeRecoveryPassword',

diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index 24d7f5a06ed948d32011de6da43197565a6a9f41..da55d81f63af39905c2ed1269f041a756bed4edf 100644 (file)
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -130,18 +130,6 @@ class RecoveryController extends Controller {
                }
        }
 
-       public function userRecovery($userEnableRecovery) {
-               if (isset($userEnableRecovery) && ($userEnableRecovery === '0' || $userEnableRecovery === '1')) {
-                       $userId = $this->user->getUID();
-                       if ($userEnableRecovery === '1') {
-                               // Todo xxx figure out if we need keyid's here or what.
-                               return $this->recovery->addRecoveryKeys();
-                       }
-                       // Todo xxx see :98
-                       return $this->recovery->removeRecoveryKeys();
-               }
-       }
-
        /**
         * @NoAdminRequired
         */