summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2016-03-15 16:01:44 +0300
committerAndrew Dolgov <[email protected]>2016-03-15 16:01:44 +0300
commit2d9ee5d16849683283a1d9f2e1d4e2e148f75d0c (patch)
tree7a0c6703ad120defb1435c9f4f23d9351249a8fb /org.fox.ttrss/src/main
parent74f09f2f5f6fd6d13b83775ec26ebc525a087ce4 (diff)
Article: properly mark not serialized types to fix freeze on N
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java16
2 files changed, 8 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 45636fc0..45665ef8 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/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="401"
- android:versionName="1.169" >
+ android:versionCode="402"
+ android:versionName="1.170" >
<uses-sdk
android:minSdkVersion="16"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
index aaa78532..bffcb8da 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
@@ -2,7 +2,6 @@ package org.fox.ttrss.types;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.Log;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -39,16 +38,13 @@ public class Article implements Parcelable {
public boolean selected;
/* not serialized */
- public Document articleDoc;
- public Element flavorImage;
+ transient public Document articleDoc;
+ transient public Element flavorImage;
- public String flavorImageUri;
- public String flavorStreamUri;
- public String youtubeVid;
-
- //public int flavorImageCount;
-
- public List<Element> mediaList = new ArrayList<>();
+ transient public String flavorImageUri;
+ transient public String flavorStreamUri;
+ transient public String youtubeVid;
+ transient public List<Element> mediaList = new ArrayList<>();
public Article(Parcel in) {
readFromParcel(in);