summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2016-05-30 12:39:06 +0300
committerAndrew Dolgov <[email protected]>2016-05-30 12:39:06 +0300
commit0ce76cdf1d4202df4d74f53022b8c279c51ae1d5 (patch)
treecbef1272d12087c4be8ccdd7e90219ac5d3a4727 /org.fox.ttrss
parentbcd19a284e796c24576082bc1c13b349dd807a08 (diff)
fix headlines fragment setSearchQuery() crashing if called before view initialization
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java6
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);
+ }
}
}