diff options
author | Andrew Dolgov <[email protected]> | 2012-11-30 20:21:31 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-11-30 20:21:31 +0400 |
commit | 89ee4a84be182c7c8cca1399dab7614b809308f5 (patch) | |
tree | 62b6f85c56863d5b50e52e663fdf21a5a40f73d7 | |
parent | 98c4325d8ba74437d667bcad5b5b9ea10a5509ec (diff) |
save more GlobalState stuff
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 8 | ||||
-rw-r--r-- | src/org/fox/ttrss/GlobalState.java | 6 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesActivity.java | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 70b3b6c4..56fb223d 100644 --- a/AndroidManifest.xml +++ b/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="114" - android:versionName="0.8.13" > + android:versionCode="115" + android:versionName="0.8.14" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index 2e44f62b..188bf1f9 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -46,9 +46,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe setSmallScreen(findViewById(R.id.headlines_fragment) == null);
- if (isSmallScreen()) {
- GlobalState.getInstance().load(savedInstanceState);
- }
+ GlobalState.getInstance().load(savedInstanceState);
Intent intent = getIntent();
@@ -250,9 +248,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe public void onSaveInstanceState(Bundle out) {
super.onSaveInstanceState(out);
- if (isSmallScreen()) {
- GlobalState.getInstance().save(out);
- }
+ GlobalState.getInstance().save(out);
}
@Override
diff --git a/src/org/fox/ttrss/GlobalState.java b/src/org/fox/ttrss/GlobalState.java index bc185326..5080e449 100644 --- a/src/org/fox/ttrss/GlobalState.java +++ b/src/org/fox/ttrss/GlobalState.java @@ -38,6 +38,9 @@ public class GlobalState extends Application { out.putParcelable("gs:activeFeed", m_activeFeed);
out.putParcelable("gs:activeArticle", m_activeArticle);
out.putString("gs:sessionId", m_sessionId);
+ out.putInt("gs:apiLevel", m_apiLevel);
+ out.putBoolean("gs:canUseProgress", m_canUseProgress);
+ out.putInt("gs:selectedArticleId", m_selectedArticleId);
}
public void load(Bundle in) {
@@ -51,6 +54,9 @@ public class GlobalState extends Application { m_activeFeed = (Feed) in.getParcelable("gs:activeFeed");
m_activeArticle = (Article) in.getParcelable("gs:activeArticle");
m_sessionId = in.getString("gs:sessionId");
+ m_apiLevel = in.getInt("gs:apiLevel");
+ m_canUseProgress = in.getBoolean("gs:canUseProgress");
+ m_selectedArticleId = in.getInt("gs:selectedArticleId");
}
}
diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 9d6746a3..97f06b6f 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -44,6 +44,8 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL }
setSmallScreen(findViewById(R.id.headlines_fragment) == null);
+
+ GlobalState.getInstance().load(savedInstanceState);
if (isPortrait()) {
findViewById(R.id.headlines_fragment).setVisibility(View.GONE);
@@ -114,7 +116,9 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL @Override
public void onSaveInstanceState(Bundle out) {
- super.onSaveInstanceState(out);
+ super.onSaveInstanceState(out);
+
+ GlobalState.getInstance().save(out);
}
@Override
|