diff options
author | Andrew Dolgov <[email protected]> | 2015-02-16 14:52:12 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-02-16 14:52:12 +0300 |
commit | 947c8dd6a3eef68fb997e8f91bb1ce91a141d522 (patch) | |
tree | 6e422e17ca1c3efe228206a8d4f2def11ca4bf40 /org.fox.ttrss/src/main | |
parent | 7a4dc9de3d33939dda61a0b45ce0a21347bedfcb (diff) |
do not send headines as parcelable because ughhhh
Diffstat (limited to 'org.fox.ttrss/src/main')
4 files changed, 11 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index fd97f34c..24e221bb 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="314" - android:versionName="1.90" > + android:versionCode="315" + android:versionName="1.91" > <uses-sdk android:minSdkVersion="15" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index 52d9b7f5..8b3251c8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -8,7 +8,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.os.Parcelable; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; @@ -444,8 +443,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("feed", hf.getFeed()); intent.putExtra("article", article); intent.putExtra("searchQuery", hf.getSearchQuery()); - //intent.putParcelableArrayListExtra("articles", hf.getArticles()); - intent.putExtra("articles", (Parcelable)hf.getAllArticles()); + //intent.putExtra("articles", (Parcelable)hf.getAllArticles()); + GlobalState.getInstance().tmpArticleList = hf.getAllArticles(); /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()); @@ -498,7 +497,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe //ArrayList<Article> tmp = data.getParcelableArrayListExtra("articles"); Article article = data.getParcelableExtra("activeArticle"); - ArticleList articles = data.getParcelableExtra("articles"); + ArticleList articles = GlobalState.getInstance().tmpArticleList; if (articles != null) { HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java index bce416be..813142d9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java @@ -3,9 +3,10 @@ package org.fox.ttrss; import android.app.Application; import android.os.Bundle; -import org.acra.ACRA; import org.acra.ReportingInteractionMode; import org.acra.annotation.ReportsCrashes; +import org.fox.ttrss.types.ArticleList; + @ReportsCrashes(formKey = "", mode = ReportingInteractionMode.DIALOG, excludeMatchingSharedPreferencesKeys = {"password"}, resDialogText = R.string.crash_dialog_text, @@ -13,7 +14,7 @@ import org.acra.annotation.ReportsCrashes; public class GlobalState extends Application { private static GlobalState m_singleton; - //public ArticleList m_loadedArticles = new ArticleList(); + public ArticleList tmpArticleList; //public Feed m_activeFeed; //public Article m_activeArticle; public int m_selectedArticleId; @@ -28,7 +29,7 @@ public class GlobalState extends Application { @Override public final void onCreate() { super.onCreate(); - ACRA.init(this); + //ACRA.init(this); m_singleton = this; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java index 62c092e2..113fe533 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java @@ -7,7 +7,6 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; -import android.os.Parcelable; import android.preference.PreferenceManager; import android.support.v4.app.FragmentTransaction; import android.util.Log; @@ -79,7 +78,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL final Article article = i.getParcelableExtra("article"); final String searchQuery = i.getStringExtra("searchQuery"); - ArticleList tmp = i.getParcelableExtra("articles"); + ArticleList tmp = GlobalState.getInstance().tmpArticleList; if (tmp != null) { m_articles.addAll(tmp); @@ -309,7 +308,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL public void onBackPressed() { Intent resultIntent = new Intent(); - resultIntent.putExtra("articles", (Parcelable) m_articles); + GlobalState.getInstance().tmpArticleList = m_articles; resultIntent.putExtra("activeArticle", m_activeArticle); setResult(Activity.RESULT_OK, resultIntent); |