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 @@ + android:versionCode="315" + android:versionName="1.91" > = Build.VERSION_CODES.LOLLIPOP) { startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()); @@ -498,7 +497,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe //ArrayList
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);