Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-19 19:28:28 +01:00
commit 36b28abc0f

View file

@ -479,14 +479,17 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
//fixes issue when local files not shown after switching tabs
if (listAdapter.getGroupCount() == 0 &&
getDownloadActivity().getLocalIndexInfos().size() > 0){
//temporarily separate this if statement to identify NPE on soma installations
//if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
if (listAdapter.getGroupCount() == 0){
if (getDownloadActivity().getLocalIndexInfos().size() > 0){
for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
listAdapter.addLocalIndexInfo(info);
}
listAdapter.sortData();
getExpandableListView().setAdapter(listAdapter);
}
}
ActionBar actionBar = getDownloadActivity().getSupportActionBar();
//hide action bar from downloadindexfragment
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);