Split binary to booleans (#203)

* replaced old status with 2 flags for unread and starred

* add fields to db, replace int(1,0) with booleans in sql queries, removed StatusFlags class + refactor code relying to it

* add repair step for migration

* again use integer(1,0) instead of bool in sql queries, because of sqlite doesn't support true/false

* add/fix unit tests for new boolean status

* set unread/starred flags as statements in sql

* fixed mysql unknown column items.unread, fixed marking of read items on repair step

* remove unnecessary bool casts

* add empty checks to Items::is* methods

* update migration to use native sql instead of the querybuilder

* don't cast the flags manually, let the api do the work

9 files changed, 170 insertions, 189 deletions

diff --git a/lib/Db/FeedMapper.php b/lib/Db/FeedMapper.php
index 056296e49..ad54ffc37 100644
--- a/lib/Db/FeedMapper.php
+++ b/lib/Db/FeedMapper.php
@@ -35,12 +35,11 @@ class FeedMapper extends NewsMapper {
                 // work because prepared statements dont work. This is a
                 // POSSIBLE SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
                 // think twice when changing this
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
+                'AND unread = ? ' .
             'WHERE `feeds`.`id` = ? ' .
                 'AND `feeds`.`user_id` = ? ' .
             'GROUP BY `feeds`.`id`';
-        $params = [$id, $userId];
+        $params = [true, $id, $userId];
 
         return $this->findEntity($sql, $params);
     }
@@ -57,15 +56,14 @@ class FeedMapper extends NewsMapper {
                 // work because prepared statements dont work. This is a
                 // POSSIBLE SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
                 // think twice when changing this
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
+                'AND unread = ? ' .
             'WHERE `feeds`.`user_id` = ? ' .
             'AND (`feeds`.`folder_id` = 0 ' .
                 'OR `folders`.`deleted_at` = 0' .
             ')' .
             'AND `feeds`.`deleted_at` = 0 ' .
             'GROUP BY `feeds`.`id`';
-        $params = [$userId];
+        $params = [true, $userId];
 
         return $this->findEntities($sql, $params);
     }
@@ -82,15 +80,14 @@ class FeedMapper extends NewsMapper {
                 // work because prepared statements dont work. This is a
                 // POSSIBLE SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
                 // think twice when changing this
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
+                'AND unread = ? ' .
             'WHERE (`feeds`.`folder_id` = 0 ' .
                 'OR `folders`.`deleted_at` = 0' .
             ')' .
             'AND `feeds`.`deleted_at` = 0 ' .
             'GROUP BY `feeds`.`id`';
 
-        return $this->findEntities($sql);
+        return $this->findEntities($sql, [true]);
     }
 
 
@@ -103,12 +100,11 @@ class FeedMapper extends NewsMapper {
                 // work because prepared statements dont work. This is a
                 // POSSIBLE SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
                 // think twice when changing this
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
+                'AND unread = ? ' .
             'WHERE `feeds`.`url_hash` = ? ' .
                 'AND `feeds`.`user_id` = ? ' .
             'GROUP BY `feeds`.`id`';
-        $params = [$hash, $userId];
+        $params = [true, $hash, $userId];
 
         return $this->findEntity($sql, $params);
     }
diff --git a/lib/Db/Item.php b/lib/Db/Item.php
index f19843c8e..a781048fd 100644
--- a/lib/Db/Item.php
+++ b/lib/Db/Item.php
@@ -37,14 +37,14 @@ use \OCP\AppFramework\Db\Entity;
  * @method void setEnclosureLink(string $value)
  * @method integer getFeedId()
  * @method void setFeedId(integer $value)
- * @method integer getStatus()
- * @method void setStatus(integer $value)
  * @method void setRtl(boolean $value)
  * @method string getLastModified()
  * @method void setLastModified(string $value)
  * @method void setFingerprint(string $value)
  * @method void setContentHash(string $value)
  * @method void setSearchIndex(string $value)
+ * @method void setUnread(bool $value)
+ * @method void setStarred(bool $value)
  */
 class Item extends Entity implements IAPI, \JsonSerializable {
 
@@ -67,53 +67,28 @@ class Item extends Entity implements IAPI, \JsonSerializable {
     protected $searchIndex;
     protected $rtl;
     protected $fingerprint;
+    protected $unread = false;
+    protected $starred = false;
 
     public function __construct() {
         $this->addType('pubDate', 'integer');
         $this->addType('updatedDate', 'integer');
         $this->addType('feedId', 'integer');
-        $this->addType('status', 'integer');
         $this->addType('rtl', 'boolean');
-    }
-
-    public function setRead() {
-        $this->markFieldUpdated('status');
-        $this->status &= ~StatusFlag::UNREAD;
-    }
-
-    public function isRead() {
-        return !(($this->status & StatusFlag::UNREAD) === StatusFlag::UNREAD);
-    }
-
-    public function setUnread() {
-        $this->markFieldUpdated('status');
-        $this->status |= StatusFlag::UNREAD;
+        $this->addType('unread', 'boolean');
+        $this->addType('starred', 'boolean');
     }
 
     public function isUnread() {
-        return !$this->isRead();
-    }
-
-    public function setStarred() {
-        $this->markFieldUpdated('status');
-        $this->status |= StatusFlag::STARRED;
+        return $this->unread;
     }
 
     public function isStarred() {
-        return ($this->status & StatusFlag::STARRED) === StatusFlag::STARRED;
-    }
-
-    public function setUnstarred() {
-        $this->markFieldUpdated('status');
-        $this->status &= ~StatusFlag::STARRED;
-    }
-
-    public function isUnstarred() {
-        return !$this->isStarred();
+        return $this->starred;
     }
 
     /**
-     * Turns entitie attributes into an array
+     * Turns entity attributes into an array
      */
     public function jsonSerialize() {
         return [
@@ -196,16 +171,8 @@ class Item extends Entity implements IAPI, \JsonSerializable {
         $item->setEnclosureMime($import['enclosureMime']);
         $item->setEnclosureLink($import['enclosureLink']);
         $item->setRtl($import['rtl']);
-        if ($import['unread']) {
-            $item->setUnread();
-        } else {
-            $item->setRead();
-        }
-        if ($import['starred']) {
-            $item->setStarred();
-        } else {
-            $item->setUnstarred();
-        }
+        $item->setUnread($import['unread']);
+        $item->setStarred($import['starred']);
 
         return $item;
     }
diff --git a/lib/Db/ItemMapper.php b/lib/Db/ItemMapper.php
index b49cdd5ea..777d0d392 100644
--- a/lib/Db/ItemMapper.php
+++ b/lib/Db/ItemMapper.php
@@ -15,6 +15,7 @@ namespace OCA\News\Db;
 
 use Exception;
 use OCA\News\Utility\Time;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 
@@ -45,18 +46,28 @@ class ItemMapper extends NewsMapper {
         'ORDER BY `items`.`id` ' . $ordering;
     }
 
-    private function makeSelectQueryStatus($prependTo, $status,
-                                           $oldestFirst = false, $search = [],
-                                           $distinctFingerprint = false) {
-        $status = (int)$status;
-        $count = count($search);
+    /**
+     * check if type is feed or all items should be shown
+     * @param bool $showAll
+     * @param int|null $type
+     * @return string
+     */
+    private function buildStatusQueryPart($showAll, $type = null) {
+        $sql = '';
+
+        if (isset($type) && $type === FeedType::STARRED) {
+            $sql = 'AND `items`.`starred` = ';
+            $sql .= $this->db->quote(true, IQueryBuilder::PARAM_BOOL) . ' ';
+        } elseif (!$showAll) {
+            $sql .= 'AND `items`.`unread` = ';
+            $sql .= $this->db->quote(true, IQueryBuilder::PARAM_BOOL) . ' ';
+        }
 
-        // WARNING: Potential SQL injection if you change this carelessly
-        $sql = 'AND ((`items`.`status` & ' . $status . ') = ' . $status . ') ';
-        $sql .= str_repeat('AND `items`.`search_index` LIKE ? ', $count);
-        $sql .= $prependTo;
+        return $sql;
+    }
 
-        return $this->makeSelectQuery($sql, $oldestFirst, $distinctFingerprint);
+    private function buildSearchQueryPart(array $search = []) {
+        return str_repeat('AND `items`.`search_index` LIKE ? ', count($search));
     }
 
     /**
@@ -88,14 +99,13 @@ class ItemMapper extends NewsMapper {
             'ON `feeds`.`id` = `items`.`feed_id` ' .
             'AND `feeds`.`deleted_at` = 0 ' .
             'AND `feeds`.`user_id` = ? ' .
-            'AND ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' .
-            StatusFlag::STARRED . ')' .
+            'AND `items`.`starred` = ? ' .
             'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
             'ON `folders`.`id` = `feeds`.`folder_id` ' .
             'WHERE `feeds`.`folder_id` = 0 ' .
             'OR `folders`.`deleted_at` = 0';
 
-        $params = [$userId];
+        $params = [$userId, true];
 
         $result = $this->execute($sql, $params)->fetch();
 
@@ -105,21 +115,21 @@ class ItemMapper extends NewsMapper {
 
     public function readAll($highestItemId, $time, $userId) {
         $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
+            'SET unread = ? ' .
             ', `last_modified` = ? ' .
             'WHERE `feed_id` IN (' .
             'SELECT `id` FROM `*PREFIX*news_feeds` ' .
             'WHERE `user_id` = ? ' .
             ') ' .
             'AND `id` <= ?';
-        $params = [~StatusFlag::UNREAD, $time, $userId, $highestItemId];
+        $params = [false, $time, $userId, $highestItemId];
         $this->execute($sql, $params);
     }
 
 
     public function readFolder($folderId, $highestItemId, $time, $userId) {
         $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
+            'SET unread = ? ' .
             ', `last_modified` = ? ' .
             'WHERE `feed_id` IN (' .
             'SELECT `id` FROM `*PREFIX*news_feeds` ' .
@@ -127,7 +137,7 @@ class ItemMapper extends NewsMapper {
             'AND `user_id` = ? ' .
             ') ' .
             'AND `id` <= ?';
-        $params = [~StatusFlag::UNREAD, $time, $folderId, $userId,
+        $params = [false, $time, $folderId, $userId,
             $highestItemId];
         $this->execute($sql, $params);
     }
@@ -135,7 +145,7 @@ class ItemMapper extends NewsMapper {
 
     public function readFeed($feedId, $highestItemId, $time, $userId) {
         $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
+            'SET unread = ? ' .
             ', `last_modified` = ? ' .
             'WHERE `feed_id` = ? ' .
             'AND `id` <= ? ' .
@@ -143,7 +153,7 @@ class ItemMapper extends NewsMapper {
             'SELECT * FROM `*PREFIX*news_feeds` ' .
             'WHERE `user_id` = ? ' .
             'AND `id` = ? ) ';
-        $params = [~StatusFlag::UNREAD, $time, $feedId, $highestItemId,
+        $params = [false, $time, $feedId, $highestItemId,
             $userId, $feedId];
 
         $this->execute($sql, $params);
@@ -159,27 +169,33 @@ class ItemMapper extends NewsMapper {
     }
 
 
-    public function findAllNew($updatedSince, $status, $userId) {
-        $sql = $this->makeSelectQueryStatus(
-            'AND `items`.`last_modified` >= ? ', $status);
+    public function findAllNew($updatedSince, $type, $showAll, $userId) {
+        $sql = $this->buildStatusQueryPart($showAll, $type);
+
+        $sql .= 'AND `items`.`last_modified` >= ? ';
+        $sql = $this->makeSelectQuery($sql);
         $params = [$userId, $updatedSince];
         return $this->findEntities($sql, $params);
     }
 
 
-    public function findAllNewFolder($id, $updatedSince, $status, $userId) {
-        $sql = 'AND `feeds`.`folder_id` = ? ' .
+    public function findAllNewFolder($id, $updatedSince, $showAll, $userId) {
+        $sql = $this->buildStatusQueryPart($showAll);
+
+        $sql .= 'AND `feeds`.`folder_id` = ? ' .
             'AND `items`.`last_modified` >= ? ';
-        $sql = $this->makeSelectQueryStatus($sql, $status);
+        $sql = $this->makeSelectQuery($sql);
         $params = [$userId, $id, $updatedSince];
         return $this->findEntities($sql, $params);
     }
 
 
-    public function findAllNewFeed($id, $updatedSince, $status, $userId) {
-        $sql = 'AND `items`.`feed_id` = ? ' .
+    public function findAllNewFeed($id, $updatedSince, $showAll, $userId) {
+        $sql = $this->buildStatusQueryPart($showAll);
+
+        $sql .= 'AND `items`.`feed_id` = ? ' .
             'AND `items`.`last_modified` >= ? ';
-        $sql = $this->makeSelectQueryStatus($sql, $status);
+        $sql = $this->makeSelectQuery($sql);
         $params = [$userId, $id, $updatedSince];
         return $this->findEntities($sql, $params);
     }
@@ -195,63 +211,68 @@ class ItemMapper extends NewsMapper {
     }
 
 
-    public function findAllFeed($id, $limit, $offset, $status, $oldestFirst,
+    public function findAllFeed($id, $limit, $offset, $showAll, $oldestFirst,
                                 $userId, $search = []) {
         $params = [$userId];
         $params = array_merge($params, $this->buildLikeParameters($search));
         $params[] = $id;
 
-        $sql = 'AND `items`.`feed_id` = ? ';
+        $sql = $this->buildStatusQueryPart($showAll);
+        $sql .= $this->buildSearchQueryPart($search);
+
+        $sql .= 'AND `items`.`feed_id` = ? ';
         if ($offset !== 0) {
             $sql .= 'AND `items`.`id` ' .
                 $this->getOperator($oldestFirst) . ' ? ';
             $params[] = $offset;
         }
-        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst,
-            $search);
+        $sql = $this->makeSelectQuery($sql, $oldestFirst, $search);
         return $this->findEntitiesIgnoringNegativeLimit($sql, $params, $limit);
     }
 
 
-    public function findAllFolder($id, $limit, $offset, $status, $oldestFirst,
+    public function findAllFolder($id, $limit, $offset, $showAll, $oldestFirst,
                                   $userId, $search = []) {
         $params = [$userId];
         $params = array_merge($params, $this->buildLikeParameters($search));
         $params[] = $id;
 
-        $sql = 'AND `feeds`.`folder_id` = ? ';
+        $sql = $this->buildStatusQueryPart($showAll);
+        $sql .= $this->buildSearchQueryPart($search);
+
+        $sql .= 'AND `feeds`.`folder_id` = ? ';
         if ($offset !== 0) {
             $sql .= 'AND `items`.`id` ' .
                 $this->getOperator($oldestFirst) . ' ? ';
             $params[] = $offset;
         }
-        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst,
-            $search);
+        $sql = $this->makeSelectQuery($sql, $oldestFirst, $search);
         return $this->findEntitiesIgnoringNegativeLimit($sql, $params, $limit);
     }
 
 
-    public function findAll($limit, $offset, $status, $oldestFirst, $userId,
+    public function findAll($limit, $offset, $type, $showAll, $oldestFirst, $userId,
                             $search = []) {
         $params = [$userId];
         $params = array_merge($params, $this->buildLikeParameters($search));
-        $sql = '';
+        $sql = $this->buildStatusQueryPart($showAll, $type);
+        $sql .= $this->buildSearchQueryPart($search);
+
         if ($offset !== 0) {
             $sql .= 'AND `items`.`id` ' .
                 $this->getOperator($oldestFirst) . ' ? ';
             $params[] = $offset;
         }
-        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst,
-            $search);
+
+        $sql = $this->makeSelectQuery($sql, $oldestFirst);
 
         return $this->findEntitiesIgnoringNegativeLimit($sql, $params, $limit);
     }
 
 
     public function findAllUnreadOrStarred($userId) {
-        $params = [$userId];
-        $status = StatusFlag::UNREAD | StatusFlag::STARRED;
-        $sql = 'AND ((`items`.`status` & ' . $status . ') > 0) ';
+        $params = [$userId, true, true];
+        $sql = 'AND (`items`.`unread` = ? OR `items`.`starred` = ?) ';
         $sql = $this->makeSelectQuery($sql);
         return $this->findEntities($sql, $params);
     }
@@ -272,15 +293,15 @@ class ItemMapper extends NewsMapper {
      * @param int $threshold the number of items that should be deleted
      */
     public function deleteReadOlderThanThreshold($threshold) {
-        $status = StatusFlag::STARRED | StatusFlag::UNREAD;
-        $params = [$status, $threshold];
+        $params = [false, false, $threshold];
 
         $sql = 'SELECT (COUNT(*) - `feeds`.`articles_per_update`) AS `size`, ' .
             '`feeds`.`id` AS `feed_id`, `feeds`.`articles_per_update` ' .
             'FROM `*PREFIX*news_items` `items` ' .
             'JOIN `*PREFIX*news_feeds` `feeds` ' .
             'ON `feeds`.`id` = `items`.`feed_id` ' .
-            'AND NOT ((`items`.`status` & ?) > 0) ' .
+            'AND `items`.`unread` = ? ' .
+            'AND `items`.`starred` = ? ' .
             'GROUP BY `feeds`.`id`, `feeds`.`articles_per_update` ' .
             'HAVING COUNT(*) > ?';
 
@@ -292,12 +313,13 @@ class ItemMapper extends NewsMapper {
             $limit = $size - $threshold;
 
             if ($limit > 0) {
-                $params = [$status, $row['feed_id'], $limit];
+                $params = [false, false, $row['feed_id'], $limit];
 
                 $sql = 'DELETE FROM `*PREFIX*news_items` ' .
                     'WHERE `id` IN (' .
                     'SELECT `id` FROM `*PREFIX*news_items` ' .
-                    'WHERE NOT ((`status` & ?) > 0) ' .
+                    'WHERE `unread` = ? ' .
+                    'AND `starred` = ? ' .
                     'AND `feed_id` = ? ' .
                     'ORDER BY `id` ASC ' .
                     'LIMIT ?' .
@@ -383,19 +405,18 @@ class ItemMapper extends NewsMapper {
         // as unread
         if ($isRead) {
             $sql = 'UPDATE `*PREFIX*news_items`
-                SET `status` = `status` & ?,
+                SET `unread` = ?,
                     `last_modified` = ?
                 WHERE `fingerprint` = ?
                     AND `feed_id` IN (
                         SELECT `f`.`id` FROM `*PREFIX*news_feeds` AS `f`
                             WHERE `f`.`user_id` = ?
                     )';
-            $params = [~StatusFlag::UNREAD, $lastModified,
-                $item->getFingerprint(), $userId];
+            $params = [false, $lastModified, $item->getFingerprint(), $userId];
             $this->execute($sql, $params);
         } else {
             $item->setLastModified($lastModified);
-            $item->setUnread();
+            $item->setUnread(true);
             $this->update($item);
         }
     }
diff --git a/lib/Db/Mysql/ItemMapper.php b/lib/Db/Mysql/ItemMapper.php
index 8053c3d87..ad373eafb 100644
--- a/lib/Db/Mysql/ItemMapper.php
+++ b/lib/Db/Mysql/ItemMapper.php
@@ -16,9 +16,6 @@ namespace OCA\News\Db\Mysql;
 use OCA\News\Utility\Time;
 use OCP\IDBConnection;
 
-use OCA\News\Db\StatusFlag;
-
-
 class ItemMapper extends \OCA\News\Db\ItemMapper {
 
     public function __construct(IDBConnection $db, Time $time){
@@ -29,19 +26,19 @@ class ItemMapper extends \OCA\News\Db\ItemMapper {
     /**
      * Delete all items for feeds that have over $threshold unread and not
      * starred items
-	 * @param int $threshold the number of items that should be deleted
+     * @param int $threshold the number of items that should be deleted
      */
     public function deleteReadOlderThanThreshold($threshold){
-        $status = StatusFlag::STARRED | StatusFlag::UNREAD;
         $sql = 'SELECT (COUNT(*) - `feeds`.`articles_per_update`) AS `size`, ' .
         '`feeds`.`id` AS `feed_id`, `feeds`.`articles_per_update` ' .
             'FROM `*PREFIX*news_items` `items` ' .
             'JOIN `*PREFIX*news_feeds` `feeds` ' .
                 'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND NOT ((`items`.`status` & ?) > 0) ' .
+                'AND `items`.`unread` = ? ' .
+                'AND `items`.`starred` = ? ' .
             'GROUP BY `feeds`.`id`, `feeds`.`articles_per_update` ' .
             'HAVING COUNT(*) > ?';
-        $params = [$status, $threshold];
+        $params = [false, false, $threshold];
         $result = $this->execute($sql, $params);
 
         while($row = $result->fetch()) {
@@ -50,10 +47,11 @@ class ItemMapper extends \OCA\News\Db\ItemMapper {
             $limit = $size - $threshold;
 
             if($limit > 0) {
-                $params = [$status, $row['feed_id'], $limit];
+                $params = [false, false, $row['feed_id'], $limit];
 
                 $sql = 'DELETE FROM `*PREFIX*news_items` ' .
-                    'WHERE NOT ((`status` & ?) > 0) ' .
+                    'WHERE `unread` = ? ' .
+                    'AND `starred` = ? ' .
                     'AND `feed_id` = ? ' .
                     'ORDER BY `id` ASC ' .
                     'LIMIT ?';
@@ -71,16 +69,15 @@ class ItemMapper extends \OCA\News\Db\ItemMapper {
             $sql = 'UPDATE `*PREFIX*news_items` `items`
                 JOIN `*PREFIX*news_feeds` `feeds`
                     ON `feeds`.`id` = `items`.`feed_id`
-                SET `items`.`status` = `items`.`status` & ?,
+                SET `items`.`unread` = ?,
                     `items`.`last_modified` = ?
                 WHERE `items`.`fingerprint` = ?
                     AND `feeds`.`user_id` = ?';
-            $params = [~StatusFlag::UNREAD, $lastModified,
-                       $item->getFingerprint(), $userId];
+            $params = [false, $lastModified, $item->getFingerprint(), $userId];
             $this->execute($sql, $params);
         } else {
             $item->setLastModified($lastModified);
-            $item->setUnread();
+            $item->setUnread(true);
             $this->update($item);
         }
     }
diff --git a/lib/Db/StatusFlag.php b/lib/Db/StatusFlag.php
deleted file mode 100644
index 314a81d01..000000000
--- a/lib/Db/StatusFlag.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Nextcloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-namespace OCA\News\Db;
-
-class StatusFlag {
-    const UNREAD    = 0x02;
-    const STARRED   = 0x04;
-    const DELETED   = 0x08;
-    const UPDATED   = 0x16;
-
-
-	/**
-	 * Get status for query
-	 *
-	 * @param int $type the type that should be turned into the status
-	 * @param bool $showAll true if it should return all read items
-	 * @return int the status for the database
-	 */
-    public function typeToStatus($type, $showAll){
-        if($type === FeedType::STARRED){
-            return self::STARRED;
-        } else {
-            $status = 0;
-        }
-
-        if($showAll){
-            $status &= ~self::UNREAD;
-        } else {
-            $status |= self::UNREAD;
-        }
-
-        return $status;
-    }
-
-
-}
\ No newline at end of file
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
index b87001723..e63db2772 100644
--- a/lib/Fetcher/FeedFetcher.php
+++ b/lib/Fetcher/FeedFetcher.php
@@ -242,7 +242,7 @@ class FeedFetcher implements IFeedFetcher {
 
     protected function buildItem($parsedItem, $parsedFeed) {
         $item = new Item();
-        $item->setUnread();
+        $item->setUnread(true);
         $item->setUrl($parsedItem->getUrl());
         $item->setGuid($parsedItem->getId());
         $item->setGuidHash($item->getGuid());
diff --git a/lib/Migration/MigrateStatusFlags.php b/lib/Migration/MigrateStatusFlags.php
new file mode 100644
index 000000000..acf53ebba
--- /dev/null
+++ b/lib/Migration/MigrateStatusFlags.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Nextcloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Daniel Opitz <dev@copynpaste.de>
+ * @copyright Daniel Opitz 2017
+ */
+
+namespace OCA\News\Migration;
+
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\Migration\IRepairStep;
+use OCP\Migration\IOutput;
+
+class MigrateStatusFlags implements IRepairStep {
+
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Migrate binary status into separate boolean fields';
+    }
+
+    public function run(IOutput $output) {
+        $version = $this->config->getAppValue('news', 'installed_version', '0.0.0');
+        if (version_compare($version, '11.0.6', '>=')) {
+            return;
+        }
+
+        $sql = 'UPDATE `*PREFIX*news_items` '
+            . 'SET `unread` = ((`status` & 2) = 2), '
+            . '`starred` = ((`status` & 4) = 4)';
+        $query = $this->db->prepare($sql);
+
+        if (!$query->execute()) {
+            throw new \Exception('Could not migrate status');
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/Service/FeedService.php b/lib/Service/FeedService.php
index f17b759e3..d24fd259e 100644
--- a/lib/Service/FeedService.php
+++ b/lib/Service/FeedService.php
@@ -264,7 +264,7 @@ class FeedService extends Service {
 
                         // update modes: 0 nothing, 1 set unread
                         if ($existingFeed->getUpdateMode() === 1) {
-                            $dbItem->setUnread();
+                            $dbItem->setUnread(true);
                         }
 
                         $this->itemMapper->update($dbItem);
diff --git a/lib/Service/ItemService.php b/lib/Service/ItemService.php
index f657b3eff..fee00ffc2 100644
--- a/lib/Service/ItemService.php
+++ b/lib/Service/ItemService.php
@@ -13,11 +13,11 @@
 
 namespace OCA\News\Service;
 
+use OCA\News\Db\Item;
 use OCP\IConfig;
 use OCP\AppFramework\Db\DoesNotExistException;
 
 use OCA\News\Db\ItemMapper;
-use OCA\News\Db\StatusFlag;
 use OCA\News\Db\FeedType;
 use OCA\News\Config\Config;
 use OCA\News\Utility\Time;
@@ -25,19 +25,16 @@ use OCA\News\Utility\Time;
 
 class ItemService extends Service {
 
-    private $statusFlag;
     private $config;
     private $timeFactory;
     private $itemMapper;
     private $systemConfig;
 
     public function __construct(ItemMapper $itemMapper,
-                                StatusFlag $statusFlag,
                                 Time $timeFactory,
                                 Config $config,
                                 IConfig $systemConfig){
         parent::__construct($itemMapper);
-        $this->statusFlag = $statusFlag;
         $this->config = $config;
         $this->timeFactory = $timeFactory;
         $this->itemMapper = $itemMapper;
@@ -56,20 +53,18 @@ class ItemService extends Service {
      * @return array of items
      */
     public function findAllNew($id, $type, $updatedSince, $showAll, $userId){
-        $status = $this->statusFlag->typeToStatus($type, $showAll);
-
         switch($type){
             case FeedType::FEED:
                 return $this->itemMapper->findAllNewFeed(
-                    $id, $updatedSince, $status, $userId
+                    $id, $updatedSince, $showAll, $userId
                 );
             case FeedType::FOLDER:
                 return $this->itemMapper->findAllNewFolder(
-                    $id, $updatedSince, $status, $userId
+                    $id, $updatedSince, $showAll, $userId
                 );
             default:
                 return $this->itemMapper->findAllNew(
-                    $updatedSince, $status, $userId
+                    $updatedSince, $type, $showAll, $userId
                 );
         }
     }
@@ -90,22 +85,20 @@ class ItemService extends Service {
      */
     public function findAll($id, $type, $limit, $offset, $showAll, $oldestFirst,
                             $userId, $search=[]){
-        $status = $this->statusFlag->typeToStatus($type, $showAll);
-
         switch($type){
             case FeedType::FEED:
                 return $this->itemMapper->findAllFeed(
-                    $id, $limit, $offset, $status, $oldestFirst, $userId,
+                    $id, $limit, $offset, $showAll, $oldestFirst, $userId,
                     $search
                 );
             case FeedType::FOLDER:
                 return $this->itemMapper->findAllFolder(
-                    $id, $limit, $offset, $status, $oldestFirst, $userId,
+                    $id, $limit, $offset, $showAll, $oldestFirst, $userId,
                     $search
                 );
             default:
                 return $this->itemMapper->findAll(
-                    $limit, $offset, $status, $oldestFirst, $userId, $search
+                    $limit, $offset, $type, $showAll, $oldestFirst, $userId, $search
                 );
         }
     }
@@ -122,15 +115,13 @@ class ItemService extends Service {
      */
     public function star($feedId, $guidHash, $isStarred, $userId){
         try {
+            /** @var Item $item */
             $item = $this->itemMapper->findByGuidHash(
                 $guidHash, $feedId, $userId
             );
 
-            if($isStarred){
-                $item->setStarred();
-            } else {
-                $item->setUnstarred();
-            }
+            $item->setStarred($isStarred);
+
             $this->itemMapper->update($item);
         } catch(DoesNotExistException $ex) {
             throw new ServiceNotFoundException($ex->getMessage());