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

Do not load the tts files from Internet anymore, only from assets

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-13 01:04:32 +02:00
parent 89ecc48e04
commit 8de181d03e
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java
View file

@ -13,6 +13,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import net.osmand.LogUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.plus.activities.DownloadIndexActivity.AssetDownloadEntry;
import net.osmand.plus.activities.DownloadIndexActivity.DownloadEntry;
@ -27,6 +28,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.AssetManager;
import android.widget.Toast;
public class DownloadOsmandIndexesHelper {
private final static Log log = LogUtil.getLog(DownloadOsmandIndexesHelper.class);
@ -36,6 +38,7 @@ public class DownloadOsmandIndexesHelper {
if (result == null) {
result = new IndexFileList();
}
//add all tts files from assets
listVoiceAssets(result, amanager, pm);
return result;
}
@ -58,18 +61,11 @@ public class DownloadOsmandIndexesHelper {
for (String voice : list) {
File destFile = new File(voicePath, voice + File.separatorChar + "_ttsconfig.p");
String key = voice + ext;
IndexItem internetVoiceFile = result.getIndexFiles().get(key);
String assetName = "voice" + File.separatorChar + voice + File.separatorChar + "ttsconfig.p";
if (internetVoiceFile == null) {
// result.getIndexFiles().remove(key);
// result.add(key, new AssetIndexItem(key, internetVoiceFile.getDescription(), internetVoiceFile.getDate(), internetVoiceFile.getSize(), internetVoiceFile.getParts(), assetName, destFile.getPath()));
// } else {
result.add(key, new AssetIndexItem(key, "voice", date, "0.1", "", assetName, destFile.getPath()));
}
result.add(key, new AssetIndexItem(key, "voice", date, "0.1", "", assetName, destFile.getPath()));
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.error("Error while loading tts files from assets", e); //$NON-NLS-1$
}
}
@ -133,7 +129,7 @@ public class DownloadOsmandIndexesHelper {
}
@Override
public DownloadEntry createDownloadEntry() {
public DownloadEntry createDownloadEntry(Context ctx) {
return new AssetDownloadEntry(assetName, destFile);
}
}
@ -204,7 +200,8 @@ public class DownloadOsmandIndexesHelper {
if (fileName.endsWith(addVersionToExt(IndexConstants.BINARY_MAP_INDEX_EXT,IndexConstants.BINARY_MAP_VERSION)) //
|| fileName.endsWith(addVersionToExt(IndexConstants.BINARY_MAP_INDEX_EXT_ZIP,IndexConstants.BINARY_MAP_VERSION)) //
|| fileName.endsWith(addVersionToExt(IndexConstants.VOICE_INDEX_EXT_ZIP, IndexConstants.VOICE_VERSION))
|| fileName.endsWith(addVersionToExt(IndexConstants.TTSVOICE_INDEX_EXT_ZIP, IndexConstants.TTSVOICE_VERSION))) {
//|| fileName.endsWith(addVersionToExt(IndexConstants.TTSVOICE_INDEX_EXT_ZIP, IndexConstants.TTSVOICE_VERSION)) drop support for downloading tts files from inet
) {
return true;
}
return false;
@ -232,7 +229,7 @@ public class DownloadOsmandIndexesHelper {
return parts;
}
public DownloadEntry createDownloadEntry() {
public DownloadEntry createDownloadEntry(Context ctx) {
IndexItem item = this;
String fileName = item.getFileName();
File parent = null;
@ -275,7 +272,7 @@ public class DownloadOsmandIndexesHelper {
}
final DownloadEntry entry;
if(parent == null || !parent.exists()){
// AccessibleToast.makeText(DownloadIndexActivity.this, getString(R.string.sd_dir_not_accessible), Toast.LENGTH_LONG).show();
AccessibleToast.makeText(ctx, ctx.getString(R.string.sd_dir_not_accessible), Toast.LENGTH_LONG).show();
entry = null;
} else {
entry = new DownloadEntry();

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

@ -233,7 +233,7 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
IndexItem es = listAdapter.getChild(0, i);
if(!entriesToDownload.containsKey(es.getFileName())){
selected++;
entriesToDownload.put(es.getFileName(), es.createDownloadEntry());
entriesToDownload.put(es.getFileName(), es.createDownloadEntry(DownloadIndexActivity.this));
}
}
AccessibleToast.makeText(this, MessageFormat.format(getString(R.string.items_were_selected), selected), Toast.LENGTH_SHORT).show();
@ -417,7 +417,7 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
return true;
}
final DownloadEntry entry = e.createDownloadEntry();
final DownloadEntry entry = e.createDownloadEntry(DownloadIndexActivity.this);
if (entry != null) {
// if(!fileToUnzip.exists()){
// builder.setMessage(MessageFormat.format(getString(R.string.download_question), baseName, extractDateAndSize(e.getValue())));