Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
@FranckRJ
FranckRJ committed Sep 11, 2019
2 parents 9d6ddb1 + 69fd891 commit bc6ffc1
Show file tree
Hide file tree
Showing 10 changed files with 165 additions and 18 deletions.
131 changes: 131 additions & 0 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.franckrj.respawnirc"
minSdkVersion 15
targetSdkVersion 28
versionCode 1_013_2_001
versionName "1.13.1"
versionCode 1_013_2_002
versionName "1.13.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resConfigs "fr"
}
Expand All @@ -30,7 +30,7 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/com/franckrj/respawnirc/jvcforum/SendTopicToForumActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -15,6 +13,9 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;

import com.franckrj.respawnirc.DraftUtils;
import com.franckrj.respawnirc.R;
import com.franckrj.respawnirc.base.AbsHomeIsBackActivity;
Expand Down Expand Up @@ -362,6 +363,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}
}
super.onActivityResult(requestCode, resultCode, data);
}

@Override
Expand Down Expand Up @@ -403,7 +405,7 @@ protected String doInBackground(SendTopicInfos... infosOfSend) {
pageContent = "respawnirc:resendneeded";
}

if (Utils.stringIsEmptyOrNull(pageContent)) {
if (Utils.stringIsEmptyOrNull(pageContent) || pageContent.contains("<meta http-equiv=\"refresh\"")) {
pageContent = "respawnirc:move:" + currentWebInfos.currentUrl;
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/franckrj/respawnirc/jvcforum/ShowForumActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}
}
super.onActivityResult(requestCode, resultCode, data);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/franckrj/respawnirc/jvctopic/JVCMessageToTopicSender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void onRequestIsFinished(String reqResult) {

currentAsyncTaskForSendMessage = null;

if (!Utils.stringIsEmptyOrNull(reqResult)) {
if (!Utils.stringIsEmptyOrNull(reqResult) && !reqResult.contains("<meta http-equiv=\"refresh\"")) {
if (reqResult.equals("respawnirc:resendneeded")) {
errorWhenSending = parentActivity.getString(R.string.unknownErrorPleaseRetry);
} else if (!isInEdit) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/franckrj/respawnirc/jvctopic/ShowTopicActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == LOCK_TOPIC_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
refreshTopicSafely();
}
super.onActivityResult(requestCode, resultCode, data);
}

@Override
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/com/franckrj/respawnirc/utils/JVCParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ public final class JVCParser {
private static final Pattern listOfModeratorsPattern = Pattern.compile("<span class=\"liste-modo-fofo\">(.*?)</span>", Pattern.DOTALL);
private static final Pattern overlyJVCQuotePattern = Pattern.compile("(<(/)?blockquote>)");
private static final Pattern overlyBetterQuotePattern = Pattern.compile("<(/)?blockquote>");
private static final Pattern jvcLinkPattern = Pattern.compile("<a href=\"([^\"]*)\"( )?( title=\"[^\"]*\")?>.*?</a>");
private static final Pattern shortLinkPattern = Pattern.compile("<span class=\"JvCare [^\"]*\"[^>]*?target=\"_blank\">([^<]*)</span>");
private static final Pattern longLinkPattern = Pattern.compile("<span class=\"JvCare [^\"]*\"[^i]*itle=\"([^\"]*)\">[^<]*<i></i><span>[^<]*</span>[^<]*</span>");
private static final Pattern jvcLinkPattern = Pattern.compile("<a +(title=\"[^\"]*\" )?href=\"([^\"]*)\"( title=\"[^\"]*\")? *>.*?</a>");
private static final Pattern shortLinkPattern = Pattern.compile("<span +class=\"JvCare [^\"]*\"[^>]*?target=\"_blank\" *>([^<]*)</span>");
private static final Pattern longLinkPattern = Pattern.compile("<span +class=\"JvCare [^\"]*\"[^i]*itle=\"([^\"]*)\" *>[^<]*<i></i><span>[^<]*</span>[^<]*</span>");
private static final Pattern smileyPattern = Pattern.compile("<img src=\"http(s)?://image\\.jeuxvideo\\.com/smileys_img/([^\"]*)\" alt=\"[^\"]*\" data-code=\"([^\"]*)\" title=\"[^\"]*\" [^>]*>");
private static final Pattern embedVideoPattern = Pattern.compile("<div class=\"player-contenu\"><div class=\"[^\"]*\"><iframe.*?src=\"([^\"]*)\"[^>]*></iframe></div></div>");
private static final Pattern jvcVideoPattern = Pattern.compile("<div class=\"player-contenu\">.*?<div class=\"player-jv\" id=\"player-jv-([^-]*)-.*?</div>[^<]*</div>[^<]*</div>[^<]*</div>", Pattern.DOTALL);
Expand Down Expand Up @@ -1069,9 +1069,9 @@ public static String parseMessageToPrettyMessage(String messageInString, Setting
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, stickerPattern, 1, "<img src=\"sticker_", ".png\"/>", new ConvertUrlToStickerId(), new ConvertStringToString("-", "_"));
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, smileyPattern, 2, "<img src=\"smiley_", "\"/>", null, null);

ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, embedVideoPattern, 1, "", "", makeLinkDependingOnSettingsAndForceMake, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcVideoPattern, 1, "", "", new AddPrefixString("http://www.jeuxvideo.com/videos/iframe/"), makeLinkDependingOnSettingsAndForceMake);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcLinkPattern, 1, "", "", makeLinkDependingOnSettingsAndForceMake, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, embedVideoPattern, 1, "<p>", "</p>", makeLinkDependingOnSettingsAndForceMake, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcVideoPattern, 1, "<p>", "</p>", new AddPrefixString("http://www.jeuxvideo.com/videos/iframe/"), makeLinkDependingOnSettingsAndForceMake);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcLinkPattern, 2, "", "", makeLinkDependingOnSettingsAndForceMake, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, shortLinkPattern, 1, "", "", makeLinkDependingOnSettingsAndForceMake, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, longLinkPattern, 1, "", "", makeLinkDependingOnSettingsAndForceMake, null);

Expand Down Expand Up @@ -1122,9 +1122,9 @@ public static String parseMessageToSimpleMessage(String messageInString) {
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, stickerPattern, 1, "[[sticker:p/", "]]", new ConvertUrlToStickerId(), null);
ToolForParsing.replaceStringByAnother(messageInBuilder, "\n", "");
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, smileyPattern, 3, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, embedVideoPattern, 1, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcVideoPattern, 1, "http://www.jeuxvideo.com/videos/iframe/", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcLinkPattern, 1, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, embedVideoPattern, 1, "<p>", "</p>", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcVideoPattern, 1, "<p>http://www.jeuxvideo.com/videos/iframe/", "</p>", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, jvcLinkPattern, 2, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, shortLinkPattern, 1, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, longLinkPattern, 1, "", "", null, null);
ToolForParsing.parseThisMessageWithThisPattern(messageInBuilder, noelshackImagePattern, 3, "", "", null, null);
Expand Down Expand Up @@ -2009,7 +2009,7 @@ private static class MakeShortenedLinkIfPossible implements Utils.StringModifier

@Override
public String changeString(String baseString) {
if (forceLinkCreation || ((baseString.startsWith("http://") || baseString.startsWith("https://")) && !baseString.contains(" "))) {
if (baseString != null && (forceLinkCreation || ((baseString.startsWith("http://") || baseString.startsWith("https://")) && !baseString.contains(" ")))) {
String linkShowed = baseString;
if (maxStringSize > 0 && linkShowed.length() > maxStringSize + 3) {
linkShowed = linkShowed.substring(0, maxStringSize / 2) + "[…]" + linkShowed.substring(linkShowed.length() - (maxStringSize / 2));
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.0'
}
}

Expand Down

0 comments on commit bc6ffc1

Please sign in to comment.