From 2cd8191d1b6933bfe14fd13f19a84a2892b993ff Mon Sep 17 00:00:00 2001 From: FoxMcCloud45 Date: Thu, 24 Jun 2021 02:08:13 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Correction=20expression=20r=C3=A9guli=C3=A8?= =?UTF-8?q?re=20sondage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java b/app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java index eb9dbb6..617e526 100644 --- a/app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java +++ b/app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java @@ -88,7 +88,7 @@ public final class JVCParser { private static final Pattern surveyTitlePattern = Pattern.compile("
([^<]*)
"); private static final Pattern surveyResultPattern = Pattern.compile("
([^<]*)
"); private static final Pattern surveyReplyPattern = Pattern.compile("[^<]*
([^<]*)
.*?([^<]*)", Pattern.DOTALL); - private static final Pattern surveyReplyWithInfosPattern = Pattern.compile("(.*?)", Pattern.DOTALL); + private static final Pattern surveyReplyWithInfosPattern = Pattern.compile("[^<]*(.*?)", Pattern.DOTALL); /* Parce que c'est faux, l'échappement n'est pas redondant s'il est supprimé la regexp est invalide. */ @SuppressWarnings("RegExpRedundantEscape") private static final Pattern realSurveyContentPattern = Pattern.compile("\"html\":\"(.*?)\"\\}"); From 6a00d4392f58b8b2140caaf48160ce1b031d477f Mon Sep 17 00:00:00 2001 From: FoxMcCloud45 Date: Thu, 24 Jun 2021 02:09:22 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20User-Agent=20ve?= =?UTF-8?q?rs=20Firefox=2089.0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/franckrj/respawnirc/utils/WebManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/franckrj/respawnirc/utils/WebManager.java b/app/src/main/java/com/franckrj/respawnirc/utils/WebManager.java index 905f86d..49d7b88 100644 --- a/app/src/main/java/com/franckrj/respawnirc/utils/WebManager.java +++ b/app/src/main/java/com/franckrj/respawnirc/utils/WebManager.java @@ -9,7 +9,7 @@ import java.util.concurrent.Callable; public class WebManager { - public static final String userAgentString = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:88.0) Gecko/20100101 Firefox/88.0"; + public static final String userAgentString = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:89.0) Gecko/20100101 Firefox/89.0"; public static String sendRequestWithMultipleTrys(String linkToPage, String requestMethod, String requestParameters, WebInfos currentInfos, int maxNumberOfTrys) { int numberOfTrys = 0; From 3aeb1cb8b7e16635db98eca315942450d567b166 Mon Sep 17 00:00:00 2001 From: FoxMcCloud45 Date: Thu, 24 Jun 2021 02:10:21 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Incr=C3=A9mentation=20version=20en=202.1.5?= =?UTF-8?q?=20+=20M=C3=80J=20Gradle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 26 +++++++++++++------------- build.gradle | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f2e6200..87966f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.franckrj.respawnirc" minSdkVersion 21 targetSdkVersion 30 - versionCode 2_001_2_004 - versionName "2.1.4" + versionCode 2_001_2_005 + versionName "2.1.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resConfigs "fr" } @@ -42,29 +42,29 @@ dependencies { testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'androidx.activity:activity:1.2.2' - implementation 'androidx.activity:activity-ktx:1.2.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.appcompat:appcompat-resources:1.2.0' + implementation 'androidx.activity:activity:1.2.3' + implementation 'androidx.activity:activity-ktx:1.2.3' + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat-resources:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.core:core:1.3.2' - implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.core:core:1.5.0' + implementation 'androidx.core:core-ktx:1.5.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' implementation 'androidx.emoji:emoji-appcompat:1.1.0' - implementation 'androidx.fragment:fragment:1.3.2' - implementation 'androidx.fragment:fragment-ktx:1.3.2' + implementation 'androidx.fragment:fragment:1.3.5' + implementation 'androidx.fragment:fragment-ktx:1.3.5' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'com.github.bumptech.glide:annotations:4.12.0' implementation 'com.github.bumptech.glide:glide:4.12.0' implementation 'com.github.bumptech.glide:okhttp3-integration:4.12.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.takisoft.preferencex:preferencex:1.0.0' implementation 'com.takisoft.preferencex:preferencex-colorpicker:1.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1' kapt 'com.github.bumptech.glide:compiler:4.12.0' } diff --git a/build.gradle b/build.gradle index f3b1f05..2800117 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From ca6755ec3bb67baffc7cdda65bc4dec4f288cfdd Mon Sep 17 00:00:00 2001 From: Franck W Date: Mon, 28 Jun 2021 21:41:34 +0200 Subject: [PATCH 4/4] =?UTF-8?q?M=C3=A0j=20de=20kotlin.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 9 --------- .idea/compiler.xml | 2 +- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 2e254c1..f9c168c 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -8,15 +8,6 @@ -