diff options
| author | David Luhmer <david-dev@live.de> | 2022-06-02 18:15:43 +0300 |
|---|---|---|
| committer | David Luhmer <david-dev@live.de> | 2022-06-02 18:15:43 +0300 |
| commit | 3c677d7eff37626ad20e83860125090c025780cf (patch) | |
| tree | 3d571e77be8e4ae502c0fc75fdda1050123d10b3 | |
| parent | b5be5401aeb3bceb8d3c8f81fc4dca8c22ec454e (diff) | |
repalce null values from server with empty strings
| -rw-r--r-- | News-Android-App/build.gradle | 4 | ||||
| -rw-r--r-- | News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java | 12 | ||||
| -rw-r--r-- | build.gradle | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index add7bb65..1f80af56 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -27,8 +27,8 @@ android { vectorDrawables.useSupportLibrary = true - versionCode 176 - versionName "0.9.9.73" + versionCode 177 + versionName "0.9.9.74" } buildFeatures { diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java index 812b9434..98ef779b 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java @@ -69,10 +69,10 @@ class InsertRssItemIntoDatabase { RssItem rssItem = new RssItem(); rssItem.setId(e.get("id").getAsLong()); rssItem.setFeedId(e.get("feedId").getAsLong()); - rssItem.setGuid(guid); - rssItem.setGuidHash(e.get("guidHash").getAsString()); - rssItem.setFingerprint(getStringOrDefault("fingerprint", null, e)); - rssItem.setLastModified(new Date(e.get("lastModified").getAsLong())); + rssItem.setGuid(guid); // non-null + rssItem.setGuidHash(e.get("guidHash").getAsString()); // non-null + rssItem.setFingerprint(getStringOrDefault("fingerprint", "", e)); + rssItem.setLastModified(new Date(Long.parseLong(getStringOrDefault("lastModified", "0", e)))); rssItem.setRead(!e.get("unread").getAsBoolean()); rssItem.setRead_temp(rssItem.getRead()); rssItem.setStarred(e.get("starred").getAsBoolean()); @@ -81,8 +81,8 @@ class InsertRssItemIntoDatabase { rssItem.setRtl(rtl); //Possible XSS fields - rssItem.setTitle(e.get("title").getAsString()); - rssItem.setAuthor(e.get("author").getAsString()); + rssItem.setTitle(getStringOrDefault("title", "", e)); + rssItem.setAuthor(getStringOrDefault("author", "", e)); rssItem.setLink(url); rssItem.setEnclosureLink(enclosureLink); rssItem.setEnclosureMime(enclosureMime); diff --git a/build.gradle b/build.gradle index 705da59d..e53e3fd3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.2.1' } } |