1 files changed, 10 insertions, 6 deletions
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index 0f3ec83a2..1bf7da664 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -28,16 +28,17 @@ namespace OCA\News\Controller;
 use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
-use \OCA\AppFramework\Db\DoesNotExistException;
-use \OCA\AppFramework\Db\MultipleObjectsReturnedException;
+
+use \OCA\News\Bl\FolderBl;
 
 
 class FolderController extends Controller {
 
+	private $folderBl;
 
-	public function __construct(API $api, Request $request, $folderMapper){
+	public function __construct(API $api, Request $request, FolderBl $folderBl){
 		parent::__construct($api, $request);
-		$this->folderMapper = $folderMapper;
+		$this->folderBl = $folderBl;
 	}
 
 
@@ -49,8 +50,11 @@ class FolderController extends Controller {
 	 * Returns all folders
 	 */
 	public function getAll(){
-		$folders = $this->folderMapper->getAll();
-		return $this->renderJSON($folders);
+		$folders = $this->folderBl->findAll($this->api->getUserId());
+		$result = array(
+			'folders' => $folders
+		);
+		return $this->renderJSON($result);
 	}