Make sure fingerprint is not null in database

5 files changed, 14 insertions, 15 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/DatabaseOrmGenerator.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/DatabaseOrmGenerator.java
index 903964be..b88eeda8 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/DatabaseOrmGenerator.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/DatabaseOrmGenerator.java
@@ -26,7 +26,7 @@ public class DatabaseOrmGenerator {
     public static void main(String[] args) throws Exception {
         List<SchemaVersion> versions = new ArrayList<>();
 
-        versions.add(new Version5(true));
+        versions.add(new Version6(true));
 
         validateSchemas(versions);
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/Version5.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/Version6.java
index 26ed8089..3c88aae1 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/Version5.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/generator/Version6.java
@@ -4,14 +4,14 @@ import de.greenrobot.daogenerator.Entity;
 import de.greenrobot.daogenerator.Property;
 import de.greenrobot.daogenerator.Schema;
 
-public class Version5 extends SchemaVersion {
+public class Version6 extends SchemaVersion {
 
     /**
      * Constructor
      *
      * @param current
      */
-    public Version5(boolean current) {
+    public Version6(boolean current) {
         super(current);
 
         Schema schema = getSchema();
@@ -23,7 +23,7 @@ public class Version5 extends SchemaVersion {
      */
     @Override
     public int getVersionNumber() {
-        return 5;
+        return 6;
     }
 
     @SuppressWarnings("unused") // id properties (folderId, etc.) need to be in database
@@ -59,7 +59,7 @@ public class Version5 extends SchemaVersion {
         rssItem.addStringProperty("author").notNull();
         rssItem.addStringProperty("guid").notNull();
         rssItem.addStringProperty("guidHash").notNull();
-        rssItem.addStringProperty("fingerprint");
+        rssItem.addStringProperty("fingerprint").notNull();
         rssItem.addBooleanProperty("read_temp");
         rssItem.addBooleanProperty("starred_temp");
         rssItem.addDateProperty("lastModified");
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/DaoMaster.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/DaoMaster.java
index 8ddc75f8..42431f6b 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/DaoMaster.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/DaoMaster.java
@@ -11,10 +11,10 @@ import de.greenrobot.dao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /** 
- * Master of DAO (schema version 5): knows all DAOs.
+ * Master of DAO (schema version 6): knows all DAOs.
 */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 5;
+    public static final int SCHEMA_VERSION = 6;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(SQLiteDatabase db, boolean ifNotExists) {
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItem.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItem.java
index 34489e07..3fc9d5be 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItem.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItem.java
@@ -25,6 +25,7 @@ public class RssItem implements HasId<Long> {
     private String guid;
     /** Not-null value. */
     private String guidHash;
+    /** Not-null value. */
     private String fingerprint;
     private Boolean read_temp;
     private Boolean starred_temp;
@@ -165,10 +166,12 @@ public class RssItem implements HasId<Long> {
         this.guidHash = guidHash;
     }
 
+    /** Not-null value. */
     public String getFingerprint() {
         return fingerprint;
     }
 
+    /** Not-null value; ensure this value is available before it is saved to the database. */
     public void setFingerprint(String fingerprint) {
         this.fingerprint = fingerprint;
     }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java
index 9e8e6ab2..f5fd6922 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java
@@ -73,7 +73,7 @@ public class RssItemDao extends AbstractDao<RssItem, Long> {
                 "\"AUTHOR\" TEXT NOT NULL ," + // 7: author
                 "\"GUID\" TEXT NOT NULL ," + // 8: guid
                 "\"GUID_HASH\" TEXT NOT NULL ," + // 9: guidHash
-                "\"FINGERPRINT\" TEXT," + // 10: fingerprint
+                "\"FINGERPRINT\" TEXT NOT NULL ," + // 10: fingerprint
                 "\"READ_TEMP\" INTEGER," + // 11: read_temp
                 "\"STARRED_TEMP\" INTEGER," + // 12: starred_temp
                 "\"LAST_MODIFIED\" INTEGER," + // 13: lastModified
@@ -125,11 +125,7 @@ public class RssItemDao extends AbstractDao<RssItem, Long> {
         stmt.bindString(8, entity.getAuthor());
         stmt.bindString(9, entity.getGuid());
         stmt.bindString(10, entity.getGuidHash());
- 
-        String fingerprint = entity.getFingerprint();
-        if (fingerprint != null) {
-            stmt.bindString(11, fingerprint);
-        }
+        stmt.bindString(11, entity.getFingerprint());
  
         Boolean read_temp = entity.getRead_temp();
         if (read_temp != null) {
@@ -188,7 +184,7 @@ public class RssItemDao extends AbstractDao<RssItem, Long> {
             cursor.getString(offset + 7), // author
             cursor.getString(offset + 8), // guid
             cursor.getString(offset + 9), // guidHash
-            cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // fingerprint
+            cursor.getString(offset + 10), // fingerprint
             cursor.isNull(offset + 11) ? null : cursor.getShort(offset + 11) != 0, // read_temp
             cursor.isNull(offset + 12) ? null : cursor.getShort(offset + 12) != 0, // starred_temp
             cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)), // lastModified
@@ -212,7 +208,7 @@ public class RssItemDao extends AbstractDao<RssItem, Long> {
         entity.setAuthor(cursor.getString(offset + 7));
         entity.setGuid(cursor.getString(offset + 8));
         entity.setGuidHash(cursor.getString(offset + 9));
-        entity.setFingerprint(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10));
+        entity.setFingerprint(cursor.getString(offset + 10));
         entity.setRead_temp(cursor.isNull(offset + 11) ? null : cursor.getShort(offset + 11) != 0);
         entity.setStarred_temp(cursor.isNull(offset + 12) ? null : cursor.getShort(offset + 12) != 0);
         entity.setLastModified(cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)));