diff --git a/README.md b/README.md index aaa974ac..ae6fa3fb 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,11 @@ Downloads Changelog --------- +Cambios en v1.99: +* Fix mangahere and fanfox. + +Changes in v1.99: +* Fix mangahere and fanfox. Cambios en v1.98: * Un par de server arreglados y una mejora. diff --git a/app/build.gradle b/app/build.gradle index fb49fcc5..5f553c94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,8 +5,8 @@ android { buildToolsVersion '28.0.2' defaultConfig { applicationId "ar.rulosoft.mimanganu" - versionCode 98 - versionName "1.98" + versionCode 99 + versionName "1.99" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" minSdkVersion 15 } diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java index c486cfb1..b1a6842f 100644 --- a/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java +++ b/app/src/main/java/ar/rulosoft/mimanganu/servers/MTownBase.java @@ -137,25 +137,32 @@ public String getImageFrom(Chapter chapter, int page) throws Exception { public void chapterInit(Chapter chapter) throws Exception { String web = getHost() + chapter.getPath(); String data = getNavigatorWithNeededHeader().get(web); - int pages = Integer.parseInt(getLastMatchDefault("data-page=\"(\\d+)\">(\\d+)", data, "1")); - if (pages == -1 && !data.contains(">>")) pages = 1; + int pages = Integer.parseInt(getLastMatchDefault("data-page=\"(\\d+)\">(\\d+)", data, "-1")); if (pages != -1) { - String cid = getFirstMatch("chapterid\\s*=\\s*(\\d+)", data, "Error on chapter initialization (1)"); - data = getFirstMatch("javascript\">\\s*(eval\\(.+?)", data, "Error on chapter initialization (3)"); - data = getFirstMatch("guidkey\\s*=(.+?);", Util.getInstance().unpack(data), "Error on chapter initialization (4)"); - ArrayList keyp = getAllMatch("'([\\d|a|b|c|d|e|f])'", data); - StringBuilder key = new StringBuilder(); - for (String string : keyp) { - key.append(string); - } - web = web.substring(0, web.length() - 6); - chapter.setPages(pages); - chapter.setExtra("1|" + cid + "|" + web + "|" + key.toString()); + cim1(data, web, chapter, pages); } else { - data = getFirstMatch("\\['(.+?)'\\]", Util.getInstance().unpack(data), "Error on chapter initialization (0)"); - chapter.setExtra("0|" + data.replaceAll("','", "|")); - chapter.setPages(data.split("','").length); + String data2 = getFirstMatchDefault("\\['(.+?)'\\]", Util.getInstance().unpack(data), ""); + if (data2.equals("")) { + cim1(data, web, chapter, 1); + return; + } + chapter.setExtra("0|" + data2.replaceAll("','", "|")); + chapter.setPages(data2.split("','").length); + } + } + + private void cim1(String data, String web, Chapter chapter, int pages) throws Exception { + String cid = getFirstMatch("chapterid\\s*=\\s*(\\d+)", data, "Error on chapter initialization (1)"); + data = getFirstMatch("javascript\">\\s*(eval\\(.+?)", data, "Error on chapter initialization (3)"); + data = getFirstMatch("guidkey\\s*=(.+?);", Util.getInstance().unpack(data), "Error on chapter initialization (4)"); + ArrayList keyp = getAllMatch("'([\\d|a|b|c|d|e|f])'", data); + StringBuilder key = new StringBuilder(); + for (String string : keyp) { + key.append(string); } + web = web.substring(0, web.length() - 6); + chapter.setPages(pages); + chapter.setExtra("1|" + cid + "|" + web + "|" + key.toString()); } @Override diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0748d0f3..bb9f35b8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,6 @@ - Cambios en v1.98:\n\t* Un par de server arreglados y una mejora.\n\t* Arreglado error en preferencias y removido el sufijo de fdroid. + Cambios en v1.99:\n\t* Fix mangahere and fanfox. Ajustar a Descargas Datos de @@ -32,8 +32,8 @@ (Descargando) (Descargado) (Error) - Licencia Apache Licencia MIT + Licencia Apache Marcar como leído Esconder imágenes descargadas de la galería Descargar no leídos diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b0c229b..a01478c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Changes in v1.98:\n\t* A couple of server fixed and a improve.\n\t* Fix pref look and remove fdroid suffix. + Changes in v1.99:\n\t* Fix mangahere and fanfox. 12 Hours 1 day 2 days