diff options
| author | Andrew Dolgov <[email protected]> | 2016-08-16 22:59:49 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2016-08-16 22:59:49 +0300 |
| commit | b0bb8cc4ea08093f593ae2f72b9a64b610c1c192 (patch) | |
| tree | 88ec412643a317e96164b1d8f56d2849ed419028 /org.fox.ttrss/src/main | |
| parent | f926fccb37bc538e856a8cdd5300f42fdf7e94c8 (diff) | |
| parent | 0ce76cdf1d4202df4d74f53022b8c279c51ae1d5 (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss-android
Diffstat (limited to 'org.fox.ttrss/src/main')
| -rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 3a8df8db..beaef47b 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="411" - android:versionName="1.177" > + android:versionCode="412" + android:versionName="1.178" > <uses-sdk android:minSdkVersion="16" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index e3f0c26f..118d28b8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1693,7 +1693,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public void setSearchQuery(String query) { if (!m_searchQuery.equals(query)) { m_searchQuery = query; - refresh(false); + + // could be called before fragment view has been initialized + if (m_list != null) { + refresh(false); + } } } |