From e5f4b8fa565662f841f97f8831e1bd382722b813 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Tue, 30 Jul 2013 12:37:11 +0100
Subject: [PATCH] update Comics Reader to 1.1.624 and UCM:RM

---
 metadata/net.kervala.comicsreader.txt         | 12 ++-
 .../net.kervala.comicsreader/unrar_17.patch   | 92 +++++++++++++++++++
 2 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 metadata/net.kervala.comicsreader/unrar_17.patch

diff --git a/metadata/net.kervala.comicsreader.txt b/metadata/net.kervala.comicsreader.txt
index 7a20ba8276..064136a9d4 100644
--- a/metadata/net.kervala.comicsreader.txt
+++ b/metadata/net.kervala.comicsreader.txt
@@ -16,7 +16,7 @@ Description:
 * Fling gesture to change page with smooth animation.
 * Fullscreen for devices with physical buttons.
 * 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
@@ -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.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
+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
-Update Check Mode:Market
-Current Version:1.1.624
+# CV is inaccurate; also on gplay and downloads page 
+Update Check Mode:RepoManifest
+Current Version:1.1
 Current Version Code:17
 
diff --git a/metadata/net.kervala.comicsreader/unrar_17.patch b/metadata/net.kervala.comicsreader/unrar_17.patch
new file mode 100644
index 0000000000..35bb961ba0
--- /dev/null
+++ b/metadata/net.kervala.comicsreader/unrar_17.patch
@@ -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();
+ 		}
+ 	}
+