v1.60

raulhaag · Feb 5, 2017 · e0432d4 · e0432d4
1 parent d4b80fd
commit e0432d4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,12 @@ Downloads
 
 Changelog
 ---------
+Cambios en v1.60:
+* Corregido orden de capítulos en Bato.to.
+
+Changes in v1.60:
+* Correct bato.to chapters load order.
+
 Cambios en v1.59:
 * Agergado Bato.to y filtro Español.
 * Arreglados los servers de ninemanga.

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "ar.rulosoft.mimanganu"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 59
-        versionName "1.59"
+        versionCode 60
+        versionName "1.60"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/BatoTo.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/BatoTo.java
@@ -157,7 +157,7 @@ public void loadMangaInformation(Manga manga, boolean forceReload) throws Except
             data = getFirstMatchDefault("ipb_table chapters_list\"([\\s\\S]+?)</table", data, "");
             Matcher matcher = pattern.matcher(data);
             while (matcher.find()) {
-                chapters.add(new Chapter("(" + matcher.group(3) + ") " + matcher.group(2) + " [" + matcher.group(4) + "]", matcher.group(1)));
+                chapters.add(0, new Chapter("(" + matcher.group(3) + ") " + matcher.group(2) + " [" + matcher.group(4) + "]", matcher.group(1)));
             }
             manga.setChapters(chapters);
         }
@@ -254,7 +254,13 @@ public Response intercept(Chain chain) throws IOException {
                             .addFormDataPart("referer", "https://bato.to/forums/")
                             .addFormDataPart("rememberMe", "1")
                             .build();
-                    Request request0 = new Request.Builder().url("https://bato.to/forums/index.php?app=core&module=global&section=login&do=process")
+                    String loginWeb;
+                    if (request.isHttps()) {
+                        loginWeb = "https://bato.to/forums/index.php?app=core&module=global&section=login&do=process";
+                    } else {
+                        loginWeb = "http://bato.to/forums/index.php?app=core&module=global&section=login&do=process";
+                    }
+                    Request request0 = new Request.Builder().url(loginWeb)
                             .method("POST", requestBody)
                             .header("User-Agent", Navigator.USER_AGENT)
                             .build();

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/BatoToEs.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/BatoToEs.java
@@ -43,7 +43,7 @@ public void loadMangaInformation(Manga manga, boolean forceReload) throws Except
             Matcher matcher = pattern.matcher(data);
             while (matcher.find()) {
                 if (matcher.group(3).contains("Spanish"))
-                    chapters.add(new Chapter("(" + matcher.group(3) + ") " + matcher.group(2) + " [" + matcher.group(4) + "]", matcher.group(1)));
+                    chapters.add(0, new Chapter("(" + matcher.group(3) + ") " + matcher.group(2) + " [" + matcher.group(4) + "]", matcher.group(1)));
             }
             manga.setChapters(chapters);
         }

diff --git a/app/src/main/java/ar/rulosoft/navegadores/Navigator.java b/app/src/main/java/ar/rulosoft/navegadores/Navigator.java
@@ -96,7 +96,7 @@ public String get(String web, String referer, Interceptor interceptor) throws Ex
         OkHttpClient copy = httpClient.newBuilder()
                 .connectTimeout(connectionTimeout, TimeUnit.SECONDS)
                 .readTimeout(readTimeout, TimeUnit.SECONDS)
-                .addNetworkInterceptor(interceptor)
+                .addInterceptor(interceptor)
                 .build();
         addHeader("Referer", referer);
         Response response = copy.newCall(new Request.Builder().url(web).headers(getHeaders()).build()).execute();
@@ -112,7 +112,7 @@ public String get(String web, Interceptor interceptor) throws Exception {
         OkHttpClient copy = httpClient.newBuilder()
                 .connectTimeout(connectionTimeout, TimeUnit.SECONDS)
                 .readTimeout(readTimeout, TimeUnit.SECONDS)
-                .addNetworkInterceptor(interceptor)
+                .addInterceptor(interceptor)
                 .build();
         addHeader("Content-Encoding", "deflate");
         addHeader("Accept-Encoding", "deflate");

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.59:\n\t* Agergado Bato.to y filtro Español. \n\t* Arreglados los servers de ninemanga.\n\t* Arreglos menores, mejoras y opciones agregadas. </string>
+    <string name="update_message">Cambios en v1.60:\n\t* Corregido orden de capítulos en Bato.to.\nCambios en v1.59:\n\t* Agergado Bato.to y filtro Español. \n\t* Arreglados los servers de ninemanga.\n\t* Arreglos menores, mejoras y opciones agregadas. </string>
     <string name="app_name">Mi Manga Nu</string>
     <string name="title_activity_activity_lector">Lector</string>
     <string name="action_ajustar_a">Ajustar a</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 in v1.59:\n\t* Added Bato.to and ES filter. \n\t* Fix ninemanga servers. \n\t* Minor fix, improves and features added. </string>
+    <string name="update_message">Changes in v1.60:\n\t* Correct bato.to chapters load order. \nChanges in v1.59:\n\t* Added Bato.to and ES filter. \n\t* Fix ninemanga servers. \n\t* Minor fix, improves and features added. </string>
     <string name="_12hours">12 Hours</string>
     <string name="_1day">1 day</string>
     <string name="_2day">2 days</string>