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

Removed unused code.

Browse source
This commit is contained in:
Denis 2014-10-09 16:00:43 +03:00
parent 461bfe0282
commit 81303ce021
3 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -550,7 +550,7 @@ public class DownloadIndexesThread {
List<IndexItem> stillUpdate = new ArrayList<IndexItem>(); List<IndexItem> stillUpdate = new ArrayList<IndexItem>();
for (IndexItem item : itemsToUpdate) { for (IndexItem item : itemsToUpdate) {
String sfName = item.getTargetFileName(); String sfName = item.getTargetFileName();
java.text.DateFormat format = uiActivity.getMyApplication().getResourceManager().getDateFormat(); java.text.DateFormat format = app.getResourceManager().getDateFormat();
String date = item.getDate(format); String date = item.getDate(format);
String indexactivateddate = indexActivatedFileNames.get(sfName); String indexactivateddate = indexActivatedFileNames.get(sfName);
String indexfilesdate = indexFileNames.get(sfName); String indexfilesdate = indexFileNames.get(sfName);

13
OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java
View file

@ -85,19 +85,6 @@ public class DownloadOsmandIndexesHelper {
File destFile = new File(voicePath, voice + File.separatorChar + "_ttsconfig.p"); File destFile = new File(voicePath, voice + File.separatorChar + "_ttsconfig.p");
result.add(new AssetIndexItem(voice +ext, "voice", date, dateModified, result.add(new AssetIndexItem(voice +ext, "voice", date, dateModified,
"0.1", 1024*100, key, destFile.getPath(), DownloadActivityType.VOICE_FILE)); "0.1", 1024*100, key, destFile.getPath(), DownloadActivityType.VOICE_FILE));
} else if (target.endsWith("/_config.p") && target.startsWith("voice/")) {
String voice = target.substring("voice/".length(), target.length() - "/_config.p".length());
IndexItem item = result.getIndexFilesByName(key);
if (item != null) {
File destFile = new File(voicePath, voice + File.separatorChar + "_config.p");
// always use bundled config
// if (item.getTimestamp() > dateModified) {
// continue;
// }
item.timestamp = dateModified;
item.attachedItem = new AssetIndexItem(voice +extvoice, "voice", date, dateModified, "0.1", 1024*100, key, destFile.getPath(),
DownloadActivityType.VOICE_FILE);
}
} }
} }
result.sort(); result.sort();

8
OsmAnd/src/net/osmand/plus/download/IndexItem.java
View file

@ -27,7 +27,6 @@ public class IndexItem implements Comparable<IndexItem> {
long timestamp; long timestamp;
long contentSize; long contentSize;
long containerSize; long containerSize;
IndexItem attachedItem;
DownloadActivityType type; DownloadActivityType type;
@ -99,13 +98,6 @@ public class IndexItem implements Comparable<IndexItem> {
if (backup.exists()) { if (backup.exists()) {
entry.existingBackupFile = backup; entry.existingBackupFile = backup;
} }
if (attachedItem != null) {
ArrayList<DownloadEntry> sz = new ArrayList<DownloadEntry>();
attachedItem.createDownloadEntry(ctx, type, sz);
if(sz.size() > 0) {
entry.attachedEntry = sz.get(0);
}
}
downloadEntries.add(entry); downloadEntries.add(entry);
} }
return downloadEntries; return downloadEntries;