clean and changed cfi to a webview implementation maybe for the momen…

…t or forever, who knows?
raulhaag · May 21, 2020 · 1f4c2bb · 1f4c2bb
1 parent ae09824
commit 1f4c2bb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,14 @@ Downloads
 
 Changelog
 ---------
+Cambios en v1.132:
+* Fix kissmanga.
+* Fix mangakawaii.
+
+Changes on v1.132:
+* Fix kissmanga.
+* Fix mangakawaii.
+
 Cambios en v1.131:
 * Fix cfi (necesita webView).
 * Fix Japscan.

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     buildToolsVersion '29.0.3'
     defaultConfig {
         applicationId "ar.rulosoft.mimanganu"
-        versionCode 131
-        versionName "1.131"
+        versionCode 132
+        versionName "1.132"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         minSdkVersion 15
     }

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/componentes/Chapter.java b/app/src/main/java/ar/rulosoft/mimanganu/componentes/Chapter.java
@@ -27,7 +27,7 @@ public class Chapter {
     private int readStatus = UNREAD;
     private String title;
     private String path;
-    private String extra = "";
+    private String extra;
     private boolean downloaded;
     private float volatile_order = -1;
 

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/KissManga.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/KissManga.java
@@ -186,7 +186,7 @@ public synchronized void chapterInit(Chapter chapter) throws Exception {
                     }
                 }
 
-                p = Pattern.compile("push\\((wrap.+?\\))\\)", Pattern.DOTALL);
+                p = Pattern.compile("lstOLA.push\\((wrap.+?\\))\\)", Pattern.DOTALL);
                 m = p.matcher(source);
                 StringBuilder sb = new StringBuilder();
                 String image;

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/MangaKawaii.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/MangaKawaii.java
@@ -104,15 +104,15 @@ public synchronized void loadMangaInformation(Manga manga, boolean forceReload)
     @Override
     public String getImageFrom(Chapter chapter, int page) throws Exception {
         assert chapter.getExtra() != null;
-        return chapter.getExtra().split("\\|")[page - 1];
+        return chapter.getExtra().split("\\|")[page];
     }
 
     @Override
     public synchronized void chapterInit(Chapter chapter) throws Exception {
-        if (chapter.getExtra() == null) {
-            String source = getNavigatorAndFlushParameters().get(HOST + chapter.getPath());
-            ArrayList<String> images = getAllMatch("data-src\", \"\\s*([^\"]+)\"", source);
-
+        if (chapter.getExtra() == null || chapter.getExtra().length() == 0) {
+            getNavigatorAndFlushParameters().get(HOST);
+            String source = getNavigatorAndFlushParameters().get(HOST + chapter.getPath() + "/1");
+            ArrayList<String> images = getAllMatch("\"data-src\", \"\\s*([^\"]+)\\s+", source);
             if (images.isEmpty()) {
                 throw new Exception(context.getString(R.string.server_failed_loading_page_count));
             }

diff --git 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.131:\n\t* Fix cfi (necesita webView).\n\t* Fix Japscan.\n\t* Otros arreglos y cambios.</string>
+    <string name="update_message">Cambios en v1.132:\n\t* Fix kissmanga.\n\t* Fix mangakawaii.</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_message">Changes on v1.131:\n\t* Fix cfi (needs webView).\n\t* Fix Japscan.\n\t* Other changes and fixes.</string>
+    <string name="update_message">Changes on v1.132:\n\t* Fix kissmanga.\n\t* Fix mangakawaii.</string>
     <string name="_12hours">12 Hours</string>
     <string name="_1day">1 day</string>
     <string name="_2day">2 days</string>