diff options
| author | Andrew Dolgov <[email protected]> | 2013-02-11 22:06:40 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-02-11 22:06:40 +0400 |
| commit | da36af7b4216bde92eb77081c39f55206fe64161 (patch) | |
| tree | 85cce66784e90e199fca20915e97ff4e9accd121 | |
| parent | 0d4bd2f4465aa499de1db3d5ee9beb859fff004e (diff) | |
fix dual refresh race condition when doing openFeedArticles() in tablet
mode
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticlePager.java | 1 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b4accd2f..68ba97e9 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="134" - android:versionName="1.12" > + android:versionCode="135" + android:versionName="1.13" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java index 9c20a105..f924e8c4 100644 --- a/src/org/fox/ttrss/ArticlePager.java +++ b/src/org/fox/ttrss/ArticlePager.java @@ -169,6 +169,7 @@ public class ArticlePager extends Fragment { } catch (BadParcelableException e) {
if (getActivity() != null) {
getActivity().finish();
+ return;
}
}
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 76cb6bf7..ab3e1cca 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -291,8 +291,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, }
if (m_articles.size() == 0 || !m_feed.equals(GlobalState.getInstance().m_activeFeed)) {
- refresh(false);
- GlobalState.getInstance().m_activeFeed = m_feed;
+ if (m_activity.getSupportFragmentManager().findFragmentByTag(CommonActivity.FRAG_ARTICLE) == null) {
+ refresh(false);
+ GlobalState.getInstance().m_activeFeed = m_feed;
+ }
} else {
notifyUpdated();
}
|