From c1123736748f68932deac13fb42c7d29ca9bb96f Mon Sep 17 00:00:00 2001
From: raulhaag <2048339+raulhaag@users.noreply.github.com>
Date: Sat, 16 Mar 2019 10:40:09 -0300
Subject: [PATCH] fix cfi and japscan v1.100

---
 README.md                                                 | 8 ++++++++
 app/build.gradle                                          | 4 ++--
 .../main/java/ar/rulosoft/mimanganu/servers/JapScan.java  | 5 +++++
 .../main/java/ar/rulosoft/navegadores/CFInterceptor.java  | 5 ++---
 app/src/main/res/values-es/strings.xml                    | 2 +-
 app/src/main/res/values/strings.xml                       | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ae6fa3fb..50bb8aa3 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,14 @@ Downloads
 
 Changelog
 ---------
+Cambios en v1.100:
+* Fix CFI.
+* Fix JapScan.
+
+Changes in v1.100:
+* Fix CFI.
+* Fix JapScan.
+
 Cambios en v1.99:
 * Fix mangahere and fanfox.
 
diff --git a/app/build.gradle b/app/build.gradle
index 5f553c94..e2cb0e65 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     buildToolsVersion '28.0.2'
     defaultConfig {
         applicationId "ar.rulosoft.mimanganu"
-        versionCode 99
-        versionName "1.99"
+        versionCode 100
+        versionName "1.100"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         minSdkVersion 15
     }
diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/JapScan.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/JapScan.java
index 64a7aa59..4c5614b1 100644
--- a/app/src/main/java/ar/rulosoft/mimanganu/servers/JapScan.java
+++ b/app/src/main/java/ar/rulosoft/mimanganu/servers/JapScan.java
@@ -130,4 +130,9 @@ public ArrayList<Manga> getMangasFiltered(int[][] filters, int pageNumber) throw
         String source = getNavigatorAndFlushParameters().get(HOST + "/mangas/" + pageNumber);
         return getMangasFromSource(source);
     }
+
+    @Override
+    public boolean needRefererForImages() {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ar/rulosoft/navegadores/CFInterceptor.java b/app/src/main/java/ar/rulosoft/navegadores/CFInterceptor.java
index 5f92bef8..57d715cf 100644
--- a/app/src/main/java/ar/rulosoft/navegadores/CFInterceptor.java
+++ b/app/src/main/java/ar/rulosoft/navegadores/CFInterceptor.java
@@ -5,7 +5,6 @@
 import com.squareup.duktape.Duktape;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -53,8 +52,8 @@ public Response resolveOverCF(Chain chain, Response response) throws IOException
             return response; // returning null here is not a good idea since it could stop a download ~xtj-9182
         }
 
-        String operation = rawOperation.replaceAll("a\\.value = (.+ \\+ t\\.length).+", "$1").replaceAll("\\s{3,}[a-z](?: = |\\.).+", "");
-        String js = operation.replaceAll("t.length", "" + domain.length()).replaceAll("\n", "");
+        String operation = rawOperation.replaceAll("a\\.value = (.+ \\+ t\\.length.+?);.+", "$1").replaceAll("\\s{3,}[a-z](?: = |\\.).+", "");
+        String js = operation.replaceAll("t.length", domain.length() + "").replaceAll("\n", "");
         Duktape duktape = Duktape.create();
         String result = "";
         try {
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bb9f35b8..97a3bf1c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_message">Cambios en v1.99:\n\t* Fix mangahere and fanfox.</string>
+    <string name="update_message">Cambios en v1.100:\n\t* Fix CFI.\n\t* Fix JapScan.</string>
     <string name="action_ajustar_a">Ajustar a</string>
     <string name="descargas">Descargas</string>
     <string name="datosde">Datos de </string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a01478c2..355f0f31 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_message">Changes in v1.99:\n\t* Fix mangahere and fanfox.</string>
+    <string name="update_message">Changes in v1.100:\n\t* Fix CFI.\n\t* Fix JapScan.</string>
     <string name="_12hours">12 Hours</string>
     <string name="_1day">1 day</string>
     <string name="_2day">2 days</string>