iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Article: properly mark not serialized types to fix freeze on N

Browse Source
This commit is contained in:
Andrew Dolgov 2016-03-15 16:01:44 +03:00
parent 74f09f2f5f
commit 2d9ee5d168
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/build.gradle
View File

@ -31,7 +31,7 @@ dependencies {
compile files('libs/universal-image-loader-1.9.3.jar') compile files('libs/universal-image-loader-1.9.3.jar')
compile 'com.android.support:cardview-v7:23.1.1' compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:support-v4:23.1.1'
compile 'com.google.code.gson:gson:2.3' compile 'com.google.code.gson:gson:2.4'
compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.shamanland:fab:0.0.5' compile 'com.shamanland:fab:0.0.5'
compile 'ch.acra:acra:4.5.0' compile 'ch.acra:acra:4.5.0'

4
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="401" android:versionCode="402"
android:versionName="1.169" > android:versionName="1.170" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"

16
org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
View File

@ -2,7 +2,6 @@ package org.fox.ttrss.types;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.Log;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
@ -39,16 +38,13 @@ public class Article implements Parcelable {
public boolean selected; public boolean selected;
/* not serialized */ /* not serialized */
public Document articleDoc; transient public Document articleDoc;
public Element flavorImage; transient public Element flavorImage;
public String flavorImageUri; transient public String flavorImageUri;
public String flavorStreamUri; transient public String flavorStreamUri;
public String youtubeVid; transient public String youtubeVid;
transient public List<Element> mediaList = new ArrayList<>();
//public int flavorImageCount;
public List<Element> mediaList = new ArrayList<>();
public Article(Parcel in) { public Article(Parcel in) {
readFromParcel(in); readFromParcel(in);