diff options
author | David Luhmer <david-dev@live.de> | 2020-07-23 18:01:07 +0300 |
---|---|---|
committer | David Luhmer <david-dev@live.de> | 2020-07-23 18:01:07 +0300 |
commit | 4645b04779bbb18ee63d44a09b1973cfff0e5910 (patch) | |
tree | 5795ece6a5e7c79841998ffb7e0bff4c3aa7841b /News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model | |
parent | 5e2c96e4170a39b3286ce9ee14785688a8e988e2 (diff) |
add support for media thumbnails
Signed-off-by: David Luhmer <david-dev@live.de>
Diffstat (limited to 'News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model')
3 files changed, 62 insertions, 5 deletions
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 42431f6b..90b1e600 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 6): knows all DAOs. + * Master of DAO (schema version 7): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { - public static final int SCHEMA_VERSION = 6; + public static final int SCHEMA_VERSION = 7; /** 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 3fc9d5be..43916ef2 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 @@ -33,6 +33,9 @@ public class RssItem implements HasId<Long> { private java.util.Date pubDate; private String enclosureLink; private String enclosureMime; + private String mediaThumbnail; + private String mediaDescription; + private Boolean rtl; /** Used to resolve relations */ private transient DaoSession daoSession; @@ -54,7 +57,7 @@ public class RssItem implements HasId<Long> { this.id = id; } - public RssItem(long id, long feedId, String link, String title, String body, Boolean read, Boolean starred, String author, String guid, String guidHash, String fingerprint, Boolean read_temp, Boolean starred_temp, java.util.Date lastModified, java.util.Date pubDate, String enclosureLink, String enclosureMime) { + public RssItem(long id, long feedId, String link, String title, String body, Boolean read, Boolean starred, String author, String guid, String guidHash, String fingerprint, Boolean read_temp, Boolean starred_temp, java.util.Date lastModified, java.util.Date pubDate, String enclosureLink, String enclosureMime, String mediaThumbnail, String mediaDescription, Boolean rtl) { this.id = id; this.feedId = feedId; this.link = link; @@ -72,6 +75,9 @@ public class RssItem implements HasId<Long> { this.pubDate = pubDate; this.enclosureLink = enclosureLink; this.enclosureMime = enclosureMime; + this.mediaThumbnail = mediaThumbnail; + this.mediaDescription = mediaDescription; + this.rtl = rtl; } /** called by internal mechanisms, do not call yourself. */ @@ -224,6 +230,30 @@ public class RssItem implements HasId<Long> { this.enclosureMime = enclosureMime; } + public String getMediaThumbnail() { + return mediaThumbnail; + } + + public void setMediaThumbnail(String mediaThumbnail) { + this.mediaThumbnail = mediaThumbnail; + } + + public String getMediaDescription() { + return mediaDescription; + } + + public void setMediaDescription(String mediaDescription) { + this.mediaDescription = mediaDescription; + } + + public Boolean getRtl() { + return rtl; + } + + public void setRtl(Boolean rtl) { + this.rtl = rtl; + } + /** To-one relationship, resolved on first access. */ public Feed getFeed() { long __key = this.feedId; 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 f5fd6922..ba4e1139 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 @@ -44,6 +44,9 @@ public class RssItemDao extends AbstractDao<RssItem, Long> { public final static Property PubDate = new Property(14, java.util.Date.class, "pubDate", false, "PUB_DATE"); public final static Property EnclosureLink = new Property(15, String.class, "enclosureLink", false, "ENCLOSURE_LINK"); public final static Property EnclosureMime = new Property(16, String.class, "enclosureMime", false, "ENCLOSURE_MIME"); + public final static Property MediaThumbnail = new Property(17, String.class, "mediaThumbnail", false, "MEDIA_THUMBNAIL"); + public final static Property MediaDescription = new Property(18, String.class, "mediaDescription", false, "MEDIA_DESCRIPTION"); + public final static Property Rtl = new Property(19, Boolean.class, "rtl", false, "RTL"); }; private DaoSession daoSession; @@ -79,7 +82,10 @@ public class RssItemDao extends AbstractDao<RssItem, Long> { "\"LAST_MODIFIED\" INTEGER," + // 13: lastModified "\"PUB_DATE\" INTEGER," + // 14: pubDate "\"ENCLOSURE_LINK\" TEXT," + // 15: enclosureLink - "\"ENCLOSURE_MIME\" TEXT);"); // 16: enclosureMime + "\"ENCLOSURE_MIME\" TEXT," + // 16: enclosureMime + "\"MEDIA_THUMBNAIL\" TEXT," + // 17: mediaThumbnail + "\"MEDIA_DESCRIPTION\" TEXT," + // 18: mediaDescription + "\"RTL\" INTEGER);"); // 19: rtl // Add Indexes db.execSQL("CREATE INDEX " + constraint + "IDX_RSS_ITEM_FEED_ID ON RSS_ITEM" + " (\"FEED_ID\");"); @@ -156,6 +162,21 @@ public class RssItemDao extends AbstractDao<RssItem, Long> { if (enclosureMime != null) { stmt.bindString(17, enclosureMime); } + + String mediaThumbnail = entity.getMediaThumbnail(); + if (mediaThumbnail != null) { + stmt.bindString(18, mediaThumbnail); + } + + String mediaDescription = entity.getMediaDescription(); + if (mediaDescription != null) { + stmt.bindString(19, mediaDescription); + } + + Boolean rtl = entity.getRtl(); + if (rtl != null) { + stmt.bindLong(20, rtl ? 1L: 0L); + } } @Override @@ -190,7 +211,10 @@ public class RssItemDao extends AbstractDao<RssItem, Long> { cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)), // lastModified cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14)), // pubDate cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // enclosureLink - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16) // enclosureMime + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // enclosureMime + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // mediaThumbnail + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // mediaDescription + cursor.isNull(offset + 19) ? null : cursor.getShort(offset + 19) != 0 // rtl ); return entity; } @@ -215,6 +239,9 @@ public class RssItemDao extends AbstractDao<RssItem, Long> { entity.setPubDate(cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14))); entity.setEnclosureLink(cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15)); entity.setEnclosureMime(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16)); + entity.setMediaThumbnail(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17)); + entity.setMediaDescription(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18)); + entity.setRtl(cursor.isNull(offset + 19) ? null : cursor.getShort(offset + 19) != 0); } /** @inheritdoc */ |