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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-11-10 10:21:24 +01:00
commit a77e6329a4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -701,6 +701,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override @Override
protected void onPostExecute(List<String> warnings) { protected void onPostExecute(List<String> warnings) {
if ( getDownloadActivity() == null) {
return;
}
getDownloadActivity().setProgressBarIndeterminateVisibility(false); getDownloadActivity().setProgressBarIndeterminateVisibility(false);
if (!warnings.isEmpty()) { if (!warnings.isEmpty()) {
final StringBuilder b = new StringBuilder(); final StringBuilder b = new StringBuilder();

3
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -42,8 +42,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
updateColor = getResources().getColor(R.color.color_update); updateColor = getResources().getColor(R.color.color_update);
osmandRegions = getMyApplication().getResourceManager().getOsmandRegions(); osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
List<IndexItem> indexItems = new ArrayList<IndexItem>(); List<IndexItem> indexItems = new ArrayList<IndexItem>();
if (DownloadActivity.downloadListIndexThread != null && if (DownloadActivity.downloadListIndexThread != null) {
DownloadActivity.downloadListIndexThread.getItemsToUpdate() != null) {
indexItems = DownloadActivity.downloadListIndexThread.getItemsToUpdate(); indexItems = DownloadActivity.downloadListIndexThread.getItemsToUpdate();
} }
listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, indexItems); listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, indexItems);