summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/org/fox/ttrss/Article.java6
2 files changed, 7 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6c7aa852..4ce9964f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="16"
- android:versionName="0.1.15">
+ android:versionCode="17"
+ android:versionName="0.1.16">
<uses-sdk android:minSdkVersion="8" />
<!-- <supports-screens android:smallScreens="false" android:normalScreens="false" /> -->
diff --git a/src/org/fox/ttrss/Article.java b/src/org/fox/ttrss/Article.java
index d6683f96..2186dd09 100644
--- a/src/org/fox/ttrss/Article.java
+++ b/src/org/fox/ttrss/Article.java
@@ -1,4 +1,5 @@
package org.fox.ttrss;
+import java.util.ArrayList;
import java.util.List;
import android.os.Parcel;
@@ -51,8 +52,11 @@ public class Article implements Parcelable {
is_updated = in.readInt() == 1;
title = in.readString();
link = in.readString();
- feed_id = in.readInt();
+ feed_id = in.readInt();
+
+ if (tags == null) tags = new ArrayList<String>();
in.readStringList(tags);
+
content = in.readString();
}