diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/CbrComicArchive.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/CbzComicArchive.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ComicArchive.java | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc26b94..58f98d2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttcomics"
- android:versionCode="35"
- android:versionName="1.2" >
+ android:versionCode="36"
+ android:versionName="1.3" >
<uses-sdk
android:minSdkVersion="8"
diff --git a/src/org/fox/ttcomics/CbrComicArchive.java b/src/org/fox/ttcomics/CbrComicArchive.java index 2ca718f..b1fb65d 100644 --- a/src/org/fox/ttcomics/CbrComicArchive.java +++ b/src/org/fox/ttcomics/CbrComicArchive.java @@ -47,7 +47,7 @@ public class CbrComicArchive extends ComicArchive { if (!header.isDirectory()) {
String name = header.isUnicode() ? header.getFileNameW() : header.getFileNameString();
- if (name.toLowerCase().matches(".*\\.(jpg|bmp|gif)$")) {
+ if (isValidComic(name)) {
m_entries.add(header);
}
}
diff --git a/src/org/fox/ttcomics/CbzComicArchive.java b/src/org/fox/ttcomics/CbzComicArchive.java index ecbbd5f..ad2a64a 100644 --- a/src/org/fox/ttcomics/CbzComicArchive.java +++ b/src/org/fox/ttcomics/CbzComicArchive.java @@ -33,7 +33,7 @@ public class CbzComicArchive extends ComicArchive { while (e.hasMoreElements()) {
ZipEntry ze = e.nextElement();
- if (!ze.isDirectory() && ze.getName().toLowerCase().matches(".*\\.(jpg|bmp|gif)$")) {
+ if (!ze.isDirectory() && isValidComic(ze.getName())) {
m_entries.add(ze);
m_count++;
}
diff --git a/src/org/fox/ttcomics/ComicArchive.java b/src/org/fox/ttcomics/ComicArchive.java index 1dedda6..3070323 100644 --- a/src/org/fox/ttcomics/ComicArchive.java +++ b/src/org/fox/ttcomics/ComicArchive.java @@ -6,4 +6,7 @@ import java.io.InputStream; public abstract class ComicArchive {
public abstract int getCount();
public abstract InputStream getItem(int index) throws IOException;
+ public boolean isValidComic(String fileName) {
+ return fileName.toLowerCase().matches(".*\\.(jpg|bmp|gif|png)$");
+ }
}
|