Skip to content
Snippets Groups Projects
Commit d07086ac authored by John Carlson's avatar John Carlson
Browse files

Fix XML classes

parent d2814d34
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -104,7 +104,8 @@ class FeedFragment : ButterKnifeFragment() {
.subscribe(object : CustomSingleObserver<Feed>() {
override fun success(feed: Feed) {
swipeRefreshLayout.isRefreshing = false
if (feed.entries != null && !feed.entries.isEmpty()) {
val entries = feed.entries
if (entries != null && !entries.isEmpty()) {
textMessage.visibility = View.GONE
} else {
Timber.d("No activity in the feed")
Loading
Loading
Loading
Loading
@@ -8,14 +8,14 @@ import java.util.*
@Parcel(Parcel.Serialization.BEAN)
@Root(strict = false)
class Entry {
@Element(name = "link", required = true)
@field:Element(name = "link", required = true)
lateinit var link: Link
@Element(name = "title", required = true)
@field:Element(name = "title", required = true)
lateinit var title: String
@Element(name = "updated", required = true)
@field:Element(name = "updated", required = true)
lateinit var updated: Date
@Element(name = "thumbnail", required = true)
@field:Element(name = "thumbnail", required = true)
lateinit var thumbnail: Thumbnail
@Element(name = "summary", required = true)
@field:Element(name = "summary", required = true)
lateinit var summary: String
}
Loading
Loading
@@ -8,8 +8,8 @@ import org.simpleframework.xml.Root
@Parcel(Parcel.Serialization.BEAN)
@Root(strict = false)
class Feed {
@Element(name = "title", required = false)
@field:Element(name = "title", required = false)
lateinit var title: String
@ElementList(name = "entry", required = false, inline = true)
lateinit var entries: List<Entry>
@field:ElementList(name = "entry", required = false, inline = true)
var entries: List<Entry>? = null
}
Loading
Loading
@@ -7,6 +7,6 @@ import org.simpleframework.xml.Root
@Parcel(Parcel.Serialization.BEAN)
@Root(strict = false)
class Link {
@Attribute(name = "href", required = true)
@field:Attribute(name = "href", required = true)
lateinit var href: String
}
Loading
Loading
@@ -7,6 +7,6 @@ import org.simpleframework.xml.Root
@Parcel(Parcel.Serialization.BEAN)
@Root(strict = false)
class Thumbnail {
@Attribute(name = "url", required = true)
@field:Attribute(name = "url", required = true)
lateinit var url: String
}
Loading
Loading
@@ -31,7 +31,7 @@ class FeedRemoteViewsFactory(private val context: Context, intent: Intent, accou
 
val appWidgetId: Int = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID)
var entries: ArrayList<Entry>? = null
var entries = mutableListOf<Entry>()
val picasso: Picasso
val rssClient: GitLabRss
 
Loading
Loading
@@ -120,8 +120,10 @@ class FeedRemoteViewsFactory(private val context: Context, intent: Intent, accou
try {
val feed = rssClient.getFeed(feedUrl)
.blockingGet()
if (feed.entries != null) {
entries!!.addAll(feed.entries)
entries.clear()
val nextEntries = feed.entries
if (nextEntries != null) {
entries.addAll(nextEntries)
}
} catch (e: Exception) {
//maybe let the user know somehow?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment