Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

revert to deactivate-code temporary fix

Browse source
This commit is contained in:
sonora 2014-12-21 11:53:29 +01:00
parent 59e206463c
commit e7d7a99ad0
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -478,18 +478,15 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (this.isDetached()) {
return;
}
//fixes issue when local files not shown after switching tabs //fixes issue when local files not shown after switching tabs
//TODO: But this throws NPE in some circumstances and needs fixing, so commented out for now //TODO: But next line throws NPE in some circumstances when called from dashboard, so needs fixing, commented out for now
if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0) { //if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0) {
for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()) { // for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()) {
listAdapter.addLocalIndexInfo(info); // listAdapter.addLocalIndexInfo(info);
} // }
listAdapter.sortData(); // listAdapter.sortData();
getExpandableListView().setAdapter(listAdapter); // getExpandableListView().setAdapter(listAdapter);
} //}
ActionBar actionBar = getDownloadActivity().getSupportActionBar(); ActionBar actionBar = getDownloadActivity().getSupportActionBar();
//hide action bar from downloadindexfragment //hide action bar from downloadindexfragment
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);