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

fix for now

Browse source
This commit is contained in:
sonora 2015-01-31 11:38:20 +01:00
parent 4e17cc3b2c
commit 57bed6b6b3
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -576,8 +576,9 @@ public class DownloadIndexesThread {
String indexfilesdate = indexFileNames.get(sfName); String indexfilesdate = indexFileNames.get(sfName);
if (date != null && if (date != null &&
!date.equals(indexactivateddate) && !date.equals(indexactivateddate) &&
!date.equals(indexfilesdate)) { !date.equals(indexfilesdate) &&
//Discrimintaion if item is deactivated to be made elsewhere in the code (DonwloadIndexAdapter, UpdateIndexFragment, etc.): indexActivatedFileNames.containsKey(sfName)) { //Discrimintaion if item is deactivated should actually be made elsewhere in the code (DonwloadIndexAdapter, UpdateIndexFragment, etc.)
indexActivatedFileNames.containsKey(sfName)) {
if ((item.getType() == DownloadActivityType.NORMAL_FILE && !item.extra) || if ((item.getType() == DownloadActivityType.NORMAL_FILE && !item.extra) ||
item.getType() == DownloadActivityType.ROADS_FILE || item.getType() == DownloadActivityType.ROADS_FILE ||
item.getType() == DownloadActivityType.SRTM_COUNTRY_FILE){ item.getType() == DownloadActivityType.SRTM_COUNTRY_FILE){

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

@ -244,21 +244,19 @@ public class UpdatesIndexFragment extends ListFragment {
+ indexActivatedFileNames.get(sfName)); + indexActivatedFileNames.get(sfName));
name.setTypeface(Typeface.DEFAULT, Typeface.NORMAL); name.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
} else if (e.getDate(format).equals(indexFileNames.get(sfName))) { } else if (e.getDate(format).equals(indexFileNames.get(sfName))) {
//Hide deactivated files from update list name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : "
//name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : " + indexFileNames.get(sfName));
// + indexFileNames.get(sfName)); name.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
//name.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
} else if (updatableResource) { } else if (updatableResource) {
name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : " name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : "
+ indexActivatedFileNames.get(sfName)); + indexActivatedFileNames.get(sfName));
name.setTextColor(updateColor); // LIGHT_BLUE name.setTextColor(updateColor); // LIGHT_BLUE
name.setTypeface(Typeface.DEFAULT, Typeface.NORMAL); name.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
} else { } else {
//Hide deactivated files from update list name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : "
//name.setText(name.getText() + "\n" + getResources().getString(R.string.local_index_installed) + " : " + indexFileNames.get(sfName));
// + indexFileNames.get(sfName)); name.setTextColor(updateColor); // LIGHT_BLUE
//name.setTextColor(updateColor); // LIGHT_BLUE name.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
//name.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
} }
} }
} }