1 files changed, 15 insertions, 13 deletions
diff --git a/external/feedapi.php b/external/feedapi.php
index dc7e1781b..b9dad00d2 100644
--- a/external/feedapi.php
+++ b/external/feedapi.php
@@ -28,6 +28,8 @@ namespace OCA\News\External;
 use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Http\Request;
+use \OCA\AppFramework\Http\JSONResponse;
+use \OCA\AppFramework\Http\Http;
 
 use \OCA\News\BusinessLayer\FeedBusinessLayer;
 use \OCA\News\BusinessLayer\FolderBusinessLayer;
@@ -77,7 +79,7 @@ class FeedAPI extends Controller {
 				$this->itemBusinessLayer->getNewestItemId($userId);
 		} catch(BusinessLayerException $ex) {}
 
-		return new NewsAPIResult($result);
+		return new JSONResponse($result);
 	}
 
 
@@ -104,14 +106,14 @@ class FeedAPI extends Controller {
 					$this->itemBusinessLayer->getNewestItemId($userId);
 			} catch(BusinessLayerException $ex) {}
 
-			return new NewsAPIResult($result);
+			return new JSONResponse($result);
 
 		} catch(BusinessLayerExistsException $ex) {
-			return new NewsAPIResult(null, NewsAPIResult::EXISTS_ERROR,
-				$ex->getMessage());
+			return new JSONResponse(array('message' => $ex->getMessage()),
+				Http::STATUS_CONFLICT);
 		} catch(BusinessLayerException $ex) {
-			return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR,
-				$ex->getMessage());
+			return new JSONResponse(array('message' => $ex->getMessage()),
+				Http::STATUS_NOT_FOUND);
 		}
 	}
 
@@ -127,10 +129,10 @@ class FeedAPI extends Controller {
 
 		try {
 			$this->feedBusinessLayer->delete($feedId, $userId);
-			return new NewsAPIResult();
+			return new JSONResponse();
 		} catch(BusinessLayerException $ex) {
-			return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR,
-				$ex->getMessage());
+			return new JSONResponse(array('message' => $ex->getMessage()),
+				Http::STATUS_NOT_FOUND);
 		}
 	}
 
@@ -146,7 +148,7 @@ class FeedAPI extends Controller {
 		$newestItemId = (int) $this->params('newestItemId');
 
 		$this->itemBusinessLayer->readFeed($feedId, $newestItemId, $userId);
-		return new NewsAPIResult();
+		return new JSONResponse();
 	}
 
 
@@ -162,10 +164,10 @@ class FeedAPI extends Controller {
 
 		try {
 			$this->feedBusinessLayer->move($feedId, $folderId, $userId);
-			return new NewsAPIResult();
+			return new JSONResponse();
 		} catch(BusinessLayerException $ex) {
-			return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR,
-				$ex->getMessage());
+			return new JSONResponse(array('message' => $ex->getMessage()),
+				Http::STATUS_NOT_FOUND);
 		}
 	}