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

Refactor download activity

Browse source
This commit is contained in:
Victor Shcherb 2012-12-20 23:59:34 +01:00
parent 936e526278
commit 847cbcd989
3 changed files with 63 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -19,6 +19,8 @@ import net.osmand.LogUtil;
import net.osmand.Version;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.map.RegionCountry;
import net.osmand.map.RegionRegistry;
import net.osmand.plus.ClientContext;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
@ -35,6 +37,7 @@ import net.osmand.plus.download.DownloadIndexAdapter;
import net.osmand.plus.download.DownloadIndexListThread;
import net.osmand.plus.download.DownloadTracker;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.download.IndexItemCategory;
import net.osmand.plus.download.SrtmIndexItem;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import android.app.AlertDialog;
@ -92,6 +95,8 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private EditText filterText;
private DownloadFileHelper downloadFileHelper = null;
private OsmandSettings settings;
private List<SrtmIndexItem> cachedSRTMFiles;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -162,9 +167,10 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
public void updateLoadedFiles() {
if (type == DownloadActivityType.SRTM_FILE) {
List<SrtmIndexItem> srtms = downloadListIndexThread.getCachedSRTMFiles();
for (SrtmIndexItem i : srtms) {
((SrtmIndexItem) i).updateExistingTiles(getMyApplication().getResourceManager().getIndexFileNames());
if (cachedSRTMFiles != null) {
for (SrtmIndexItem i : cachedSRTMFiles) {
((SrtmIndexItem) i).updateExistingTiles(getMyApplication().getResourceManager().getIndexFileNames());
}
}
((DownloadIndexAdapter) getExpandableListAdapter()).notifyDataSetInvalidated();
}
@ -242,7 +248,8 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
filtered.add(fileItem);
}
}
listAdapter.setIndexFiles(filtered);
listAdapter.setIndexFiles(filtered, IndexItemCategory.categorizeIndexItems(getClientContext(), filtered));
listAdapter.notifyDataSetChanged();
} else if (item.getItemId() == DOWNLOAD_FILES_TYPE) {
selectDownloadType();
} else if(item.getItemId() == DESELECT_ALL_ID){
@ -289,24 +296,62 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
public void changeType(final DownloadActivityType tp) {
if (downloadListIndexThread != null) {
type = tp;
final List<IndexItem> filtered = getFilteredByType();
entriesToDownload.clear();
DownloadIndexAdapter a = ((DownloadIndexAdapter) getExpandableListAdapter());
a.setIndexFiles(filtered);
a.getFilter().filter(filterText.getText());
AsyncTask<Void, Void, List<IndexItem>> t = new AsyncTask<Void, Void, List<IndexItem>>(){
private List<IndexItemCategory> cats;
private ProgressDialog progressDialog;
@Override
protected void onPreExecute() {
super.onPreExecute();
progressDialog = ProgressDialog.show(DownloadIndexActivity.this,
getString(R.string.downloading), getString(R.string.downloading_list_indexes));
}
@Override
protected List<IndexItem> doInBackground(Void... params) {
final List<IndexItem> filtered = getFilteredByType();
cats = IndexItemCategory.categorizeIndexItems(getClientContext(), filtered);
return filtered;
}
@Override
protected void onPostExecute(List<IndexItem> filtered) {
entriesToDownload.clear();
DownloadIndexAdapter a = ((DownloadIndexAdapter) getExpandableListAdapter());
a.setIndexFiles(filtered, cats);
a.notifyDataSetChanged();
a.getFilter().filter(filterText.getText());
progressDialog.dismiss();
}
};
t.execute();
}
}
public List<IndexItem> getFilteredByType() {
final List<IndexItem> filtered = new ArrayList<IndexItem>();
if(type == DownloadActivityType.SRTM_FILE){
List<SrtmIndexItem> cached = downloadListIndexThread.getCachedSRTMFiles();
if (type == DownloadActivityType.SRTM_FILE) {
Map<String, String> indexFileNames = getMyApplication().getResourceManager().getIndexFileNames();
for(SrtmIndexItem s : cached){
s.updateExistingTiles(indexFileNames);
filtered.add(s);
if (cachedSRTMFiles == null) {
cachedSRTMFiles = new ArrayList<SrtmIndexItem>();
List<RegionCountry> countries = RegionRegistry.getRegionRegistry().getCountries();
for (RegionCountry rc : countries) {
if (rc.tiles.size() > 35) {
for (RegionCountry ch : rc.getSubRegions()) {
cachedSRTMFiles.add(new SrtmIndexItem(ch, indexFileNames));
}
} else {
cachedSRTMFiles.add(new SrtmIndexItem(rc, indexFileNames));
}
}
filtered.addAll(cachedSRTMFiles);
} else {
for (SrtmIndexItem s : cachedSRTMFiles) {
s.updateExistingTiles(indexFileNames);
filtered.add(s);
}
}
}
for (IndexItem file : downloadListIndexThread.getCachedIndexFiles()) {

9
OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
View file

@ -86,16 +86,11 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
}
public void setIndexFiles(List<IndexItem> indexFiles) {
public synchronized void setIndexFiles(List<IndexItem> indexFiles, Collection<? extends IndexItemCategory> cats) {
this.indexFiles.clear();
for (IndexItem i : indexFiles) {
this.indexFiles.add(i);
}
List<IndexItemCategory> cats = IndexItemCategory.categorizeIndexItems(downloadActivity.getClientContext(), indexFiles);
synchronized (this) {
this.indexFiles.addAll(indexFiles);
list.clear();
list.addAll(cats);
}
notifyDataSetChanged();
}

25
OsmAnd/src/net/osmand/plus/download/DownloadIndexListThread.java
View file

@ -2,17 +2,11 @@ package net.osmand.plus.download;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.osmand.access.AccessibleToast;
import net.osmand.map.RegionCountry;
import net.osmand.map.RegionRegistry;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.DownloadIndexActivity;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import android.content.Context;
import android.view.View;
import android.widget.Toast;
@ -20,7 +14,6 @@ import android.widget.Toast;
public class DownloadIndexListThread extends Thread {
private DownloadIndexActivity uiActivity = null;
private IndexFileList indexFiles = null;
private List<SrtmIndexItem> cachedSRTMFiles = new ArrayList<SrtmIndexItem>();
private final Context ctx;
public DownloadIndexListThread(Context ctx) {
@ -37,9 +30,7 @@ public class DownloadIndexListThread extends Thread {
return indexFiles != null ? indexFiles.getIndexFiles() : null;
}
public List<SrtmIndexItem> getCachedSRTMFiles() {
return cachedSRTMFiles;
}
public boolean isDownloadedFromInternet() {
return indexFiles != null && indexFiles.isDownloadedFromInternet();
@ -48,20 +39,6 @@ public class DownloadIndexListThread extends Thread {
@Override
public void run() {
indexFiles = DownloadOsmandIndexesHelper.getIndexesList(ctx);
if(OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null){
cachedSRTMFiles.clear();
Map<String, String> indexFileNames = new LinkedHashMap<String, String>();
List<RegionCountry> countries = RegionRegistry.getRegionRegistry().getCountries();
for(RegionCountry rc : countries){
if(rc.tiles.size() > 35){
for(RegionCountry ch : rc.getSubRegions()) {
cachedSRTMFiles.add(new SrtmIndexItem(ch, indexFileNames));
}
} else {
cachedSRTMFiles.add(new SrtmIndexItem(rc, indexFileNames));
}
}
}
if (uiActivity != null) {
uiActivity.removeDialog(DownloadIndexActivity.DIALOG_PROGRESS_LIST);
uiActivity.runOnUiThread(new Runnable() {