diff --git a/assets/languagePatterns.tar b/assets/languagePatterns.tar deleted file mode 100644 index d11c586be..000000000 Binary files a/assets/languagePatterns.tar and /dev/null differ diff --git a/assets/languagePatterns/cs_tmp b/assets/languagePatterns/cs_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/de-traditional_tmp b/assets/languagePatterns/de-traditional_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/de_tmp b/assets/languagePatterns/de_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/el_tmp b/assets/languagePatterns/el_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/en_tmp b/assets/languagePatterns/en_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/eo_tmp b/assets/languagePatterns/eo_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/es_tmp b/assets/languagePatterns/es_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/fi_tmp b/assets/languagePatterns/fi_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/fr_tmp b/assets/languagePatterns/fr_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/id_tmp b/assets/languagePatterns/id_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/it_tmp b/assets/languagePatterns/it_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/no_tmp b/assets/languagePatterns/no_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/pt_tmp b/assets/languagePatterns/pt_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/ru_tmp b/assets/languagePatterns/ru_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/sv_tmp b/assets/languagePatterns/sv_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/tr_tmp b/assets/languagePatterns/tr_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/assets/languagePatterns/uk_tmp b/assets/languagePatterns/uk_tmp new file mode 100644 index 000000000..e69de29bb diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java index 34aafb0a6..d982c7867 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java @@ -42,7 +42,7 @@ public abstract class ZLResourceFile extends ZLFile { } public String getNameWithExtension() { - return myPath; + return myPath.substring(myPath.lastIndexOf('/') + 1); } public ZLFile getParent() { diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java index 084a02d1a..9c39e9f45 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java @@ -55,6 +55,6 @@ public abstract class ZLLanguageList { } public static ZLFile patternsFile() { - return ZLResourceFile.createResourceFile("languagePatterns.tar"); + return ZLResourceFile.createResourceFile("languagePatterns"); } } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index 2fedc56ef..f6a62cfd0 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -20,7 +20,7 @@ package org.geometerplus.zlibrary.ui.android.library; import java.io.*; -import java.util.Date; +import java.util.*; import android.app.Application; import android.content.res.Resources; @@ -31,6 +31,7 @@ import android.text.format.DateFormat; import android.util.DisplayMetrics; import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.image.ZLImage; @@ -87,7 +88,6 @@ public final class ZLAndroidLibrary extends ZLibrary { intent.putExtra(BookDownloaderService.SHOW_NOTIFICATIONS_KEY, BookDownloaderService.Notifications.ALL); externalUrl = false; } - // FIXME: initialize network library and use rewriteUrl!!! final NetworkLibrary nLibrary = NetworkLibrary.Instance(); try { nLibrary.initialize(); @@ -149,17 +149,38 @@ public final class ZLAndroidLibrary extends ZLibrary { } @Override - public boolean exists() { + protected List directoryEntries() { + try { + String[] names = myApplication.getAssets().list(getPath()); + if (names != null && names.length != 0) { + ArrayList files = new ArrayList(names.length); + for (String n : names) { + files.add(new AndroidAssetsFile(getPath() + "/" + n)); + } + return files; + } + } catch (IOException e) { + } + return Collections.emptyList(); + } + + @Override + public boolean isDirectory() { try { AssetFileDescriptor descriptor = myApplication.getAssets().openFd(getPath()); if (descriptor == null) { - return false; + return true; } descriptor.close(); - return true; - } catch (IOException e) { return false; - } + } catch (IOException e) { + return true; + } + } + + @Override + public boolean exists() { + return true; } @Override