Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-20 20:28:14 +02:00
commit 20a00326c3

View file

@ -118,7 +118,6 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
View bottomShadowView = inflater.inflate(R.layout.card_bottom_divider, listView, false); View bottomShadowView = inflater.inflate(R.layout.card_bottom_divider, listView, false);
listView.addFooterView(bottomShadowView); listView.addFooterView(bottomShadowView);
adapter = new LocalIndexesAdapter(this); adapter = new LocalIndexesAdapter(this);
listView.setAdapter(adapter);
listView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { listView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
@Override @Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
@ -152,6 +151,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
} }
}); });
} }
listView.setAdapter(adapter);
if(Build.VERSION.SDK_INT >= 11) { if(Build.VERSION.SDK_INT >= 11) {
loadLocalIndexesTask = new LoadLocalIndexTask(adapter, this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); loadLocalIndexesTask = new LoadLocalIndexTask(adapter, this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);