diff options
| author | Andrew Dolgov <[email protected]> | 2012-11-30 10:08:00 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-11-30 10:08:00 +0400 |
| commit | 72e9280fefe0859ef611968fc6f3c75c0444d9c3 (patch) | |
| tree | bc331b54ae3ece965972f8cfc1473c3c25b1f62c | |
| parent | 251c648196c63ff6d6107ff9e629b602bc8f2ffd (diff) | |
serialize GlobalState data on small devices
| -rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 12 | ||||
| -rw-r--r-- | src/org/fox/ttrss/GlobalState.java | 26 |
2 files changed, 36 insertions, 2 deletions
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index 4472873b..2e44f62b 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -45,7 +45,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe setContentView(R.layout.feeds);
setSmallScreen(findViewById(R.id.headlines_fragment) == null);
-
+
+ if (isSmallScreen()) {
+ GlobalState.getInstance().load(savedInstanceState);
+ }
+
Intent intent = getIntent();
if (savedInstanceState == null) {
@@ -244,7 +248,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe @Override
public void onSaveInstanceState(Bundle out) {
- super.onSaveInstanceState(out);
+ super.onSaveInstanceState(out);
+
+ if (isSmallScreen()) {
+ GlobalState.getInstance().save(out);
+ }
}
@Override
diff --git a/src/org/fox/ttrss/GlobalState.java b/src/org/fox/ttrss/GlobalState.java index ba13e776..bc185326 100644 --- a/src/org/fox/ttrss/GlobalState.java +++ b/src/org/fox/ttrss/GlobalState.java @@ -1,10 +1,14 @@ package org.fox.ttrss;
+import java.util.ArrayList;
+
import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
import org.fox.ttrss.types.Feed;
import android.app.Application;
+import android.os.Bundle;
+import android.os.Parcelable;
public class GlobalState extends Application {
private static GlobalState m_singleton;
@@ -28,4 +32,26 @@ public class GlobalState extends Application { super.onCreate();
m_singleton = this;
}
+
+ public void save(Bundle out) {
+ out.putParcelableArrayList("gs:loadedArticles", m_loadedArticles);
+ out.putParcelable("gs:activeFeed", m_activeFeed);
+ out.putParcelable("gs:activeArticle", m_activeArticle);
+ out.putString("gs:sessionId", m_sessionId);
+ }
+
+ public void load(Bundle in) {
+ if (m_loadedArticles.size() == 0 && in != null) {
+ ArrayList<Parcelable> list = in.getParcelableArrayList("gs:loadedArticles");
+
+ for (Parcelable p : list) {
+ m_loadedArticles.add((Article)p);
+ }
+
+ m_activeFeed = (Feed) in.getParcelable("gs:activeFeed");
+ m_activeArticle = (Article) in.getParcelable("gs:activeArticle");
+ m_sessionId = in.getString("gs:sessionId");
+ }
+
+ }
}
|