update Comics Reader to 1.1.624 and UCM:RM

This commit is contained in:
David Black 2013-07-30 12:37:11 +01:00
parent ec3b115e8a
commit e5f4b8fa56
2 changed files with 101 additions and 3 deletions

View file

@ -16,7 +16,7 @@ Description:
* Fling gesture to change page with smooth animation. * Fling gesture to change page with smooth animation.
* Fullscreen for devices with physical buttons. * Fullscreen for devices with physical buttons.
* Use lower quality images (resolution is decreased) if any out of memory exception occurs. * Use lower quality images (resolution is decreased) if any out of memory exception occurs.
* Available in English and French languages (any translators are welcome to contribute ^^) * Available in English, French & Turkish languages (any translators are welcome to contribute ^^)
. .
Repo Type:hg Repo Type:hg
@ -29,9 +29,15 @@ Build Version:1.0.566,12,6fc1154e7964,buildjni=yes,forceversion=yes
Build Version:1.0.576,13,a1f5b72b82f3,buildjni=yes,forceversion=yes Build Version:1.0.576,13,a1f5b72b82f3,buildjni=yes,forceversion=yes
Build Version:1.1.612,15,555d0d6ed6bb,forceversion=yes,patch=unrar.patch,prebuild=\ Build Version:1.1.612,15,555d0d6ed6bb,forceversion=yes,patch=unrar.patch,prebuild=\
rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java,buildjni=no rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java,buildjni=no
Build Version:1.1.624,17,40,\
forceversion=yes,\
patch=unrar_17.patch,\
prebuild=rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java,\
buildjni=no
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Market # CV is inaccurate; also on gplay and downloads page
Current Version:1.1.624 Update Check Mode:RepoManifest
Current Version:1.1
Current Version Code:17 Current Version Code:17

View file

@ -0,0 +1,92 @@
diff -r 6650f062edf6 src/net/kervala/comicsreader/Album.java
--- a/src/net/kervala/comicsreader/Album.java Mon Jun 10 20:46:47 2013 +0200
+++ b/src/net/kervala/comicsreader/Album.java Tue Jul 30 12:26:15 2013 +0100
@@ -57,7 +57,6 @@
static final int ALBUM_TYPE_NONE = 0;
static final int ALBUM_TYPE_CBZ = 1;
- static final int ALBUM_TYPE_CBR = 2;
static final int ALBUM_TYPE_CBT = 3;
static final int ALBUM_TYPE_FOLDER = 4;
@@ -66,10 +65,6 @@
return new CbzAlbum();
}
- if (CbrAlbum.isValid(filename)) {
- return new CbrAlbum();
- }
-
if (CbtAlbum.isValid(filename)) {
return new CbtAlbum();
}
@@ -103,11 +98,6 @@
return ALBUM_TYPE_CBZ;
}
- // file is a cbr
- if (CbrAlbum.isValid(filename)) {
- return ALBUM_TYPE_CBR;
- }
-
// file is a cbt
if (CbtAlbum.isValid(filename)) {
return ALBUM_TYPE_CBT;
@@ -128,7 +118,6 @@
switch(getType(uriString))
{
case ALBUM_TYPE_CBZ: return CbzAlbum.getMimeType(filename);
- case ALBUM_TYPE_CBR: return CbrAlbum.getMimeType(filename);
case ALBUM_TYPE_CBT: return CbtAlbum.getMimeType(filename);
case ALBUM_TYPE_FOLDER: return FolderAlbum.getMimeType(filename);
default: break;
@@ -151,9 +140,6 @@
// file is a cbz
if (CbzAlbum.isValid(filename)) return true;
- // file is a cbr
- if (CbrAlbum.isValid(filename)) return true;
-
// file is a cbt
if (CbtAlbum.isValid(filename)) return true;
@@ -177,9 +163,6 @@
// file is a cbz
if (CbzAlbum.isValid(filename)) return true;
- // file is a cbr
- if (CbrAlbum.isValid(filename)) return true;
-
// file is a cbt
if (CbtAlbum.isValid(filename)) return true;
@@ -193,9 +176,6 @@
// file is a cbz
if (CbzAlbum.askConfirm(filename)) return true;
- // file is a cbr
- if (CbrAlbum.askConfirm(filename)) return true;
-
// file is a cbt
if (CbtAlbum.askConfirm(filename)) return true;
@@ -209,7 +189,6 @@
switch(getType(filename))
{
case ALBUM_TYPE_CBZ: return CbzAlbum.getTitle(filename);
- case ALBUM_TYPE_CBR: return CbrAlbum.getTitle(filename);
case ALBUM_TYPE_CBT: return CbtAlbum.getTitle(filename);
case ALBUM_TYPE_FOLDER: return FolderAlbum.getTitle(filename);
default: break;
diff -r 6650f062edf6 src/net/kervala/comicsreader/FolderAlbum.java
--- a/src/net/kervala/comicsreader/FolderAlbum.java Mon Jun 10 20:46:47 2013 +0200
+++ b/src/net/kervala/comicsreader/FolderAlbum.java Tue Jul 30 12:26:15 2013 +0100
@@ -58,7 +58,7 @@
// build a full absolute path
filename = f.getAbsolutePath();
- return CbzAlbum.isValid(filename) || CbrAlbum.isValid(filename) || CbtAlbum.isValid(filename) || f.isDirectory();
+ return CbzAlbum.isValid(filename) || CbtAlbum.isValid(filename) || f.isDirectory();
}
}