iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix possible crash in headlinesfragment.refresh if invoked when fragment

Browse Source 
is not yet initialized
This commit is contained in:
Andrew Dolgov 2013-06-03 22:52:51 +04:00
parent 124c791ab8
commit 1f91618d33
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="184" android:versionCode="185"
android:versionName="1.8.4" > android:versionName="1.8.5" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

1
src/org/fox/ttrss/FeedsFragment.java
View File

@ -282,7 +282,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
@SuppressWarnings({ "unchecked", "serial" }) @SuppressWarnings({ "unchecked", "serial" })
public void refresh(boolean background) { public void refresh(boolean background) {
//FeedCategory cat = m_onlineServices.getActiveCategory(); //FeedCategory cat = m_onlineServices.getActiveCategory();
m_activity.setProgressBarVisibility(true); m_activity.setProgressBarVisibility(true);
final int catId = (m_activeCategory != null) ? m_activeCategory.id : -4; final int catId = (m_activeCategory != null) ? m_activeCategory.id : -4;

2
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -362,7 +362,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
@SuppressWarnings({ "unchecked", "serial" }) @SuppressWarnings({ "unchecked", "serial" })
public void refresh(boolean append) { public void refresh(boolean append) {
if (m_activity != null) { if (m_activity != null && m_feed != null) {
m_refreshInProgress = true; m_refreshInProgress = true;
m_activity.setProgressBarVisibility(true); m_activity.setProgressBarVisibility(true);