public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPEs on launch.

Browse source
This commit is contained in:
ojiikun 2013-11-20 06:37:04 +00:00
parent d5a04d0b1e
commit 25240a69ca
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clients/android/NewsBlur/src/com/newsblur/activity/Main.java
View file

@ -71,9 +71,7 @@ public class Main extends NbFragmentActivity implements StateChangedListener, Sy
private void triggerFirstSync() {
PrefsUtils.updateLastSyncTime(this);
setSupportProgressBarIndeterminateVisibility(true);
if (menu != null) {
menu.findItem(R.id.menu_refresh).setEnabled(false);
}
setRefreshEnabled(false);
final Intent intent = new Intent(Intent.ACTION_SYNC, null, this, SyncService.class);
intent.putExtra(SyncService.EXTRA_STATUS_RECEIVER, syncFragment.receiver);
@ -87,9 +85,7 @@ public class Main extends NbFragmentActivity implements StateChangedListener, Sy
private void triggerRefresh() {
PrefsUtils.updateLastSyncTime(this);
setSupportProgressBarIndeterminateVisibility(true);
if (menu != null) {
menu.findItem(R.id.menu_refresh).setEnabled(false);
}
setRefreshEnabled(false);
final Intent intent = new Intent(Intent.ACTION_SYNC, null, this, SyncService.class);
intent.putExtra(SyncService.EXTRA_STATUS_RECEIVER, syncFragment.receiver);
@ -154,9 +150,7 @@ public class Main extends NbFragmentActivity implements StateChangedListener, Sy
public void updateAfterSync() {
folderFeedList.hasUpdated();
setSupportProgressBarIndeterminateVisibility(false);
MenuItem refreshItem = menu.findItem(R.id.menu_refresh);
if (refreshItem != null) refreshItem.setEnabled(true);
setRefreshEnabled(true);
}
/**
@ -174,13 +168,21 @@ public class Main extends NbFragmentActivity implements StateChangedListener, Sy
// interface method may be redundant.
if (syncRunning) {
setSupportProgressBarIndeterminateVisibility(true);
if (menu != null) {
menu.findItem(R.id.menu_refresh).setEnabled(true);
}
setRefreshEnabled(false);
}
}
@Override
public void setNothingMoreToUpdate() { }
private void setRefreshEnabled(boolean enabled) {
if (menu != null) {
MenuItem item = menu.findItem(R.id.menu_refresh);
if (item != null) {
item.setEnabled(enabled);
}
}
}
}