From 2d9ee5d16849683283a1d9f2e1d4e2e148f75d0c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 15 Mar 2016 16:01:44 +0300
Subject: Article: properly mark not serialized types to fix freeze on N

---
 org.fox.ttrss/src/main/AndroidManifest.xml               |  4 ++--
 .../src/main/java/org/fox/ttrss/types/Article.java       | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'org.fox.ttrss/src')

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);
-- 
cgit v1.2.3-54-g00ecf