Browse Source

Removed redundant character escapes to fix lint errors.

master
Anthony Restaino 9 years ago
parent
commit
13c6594e0c
  1. 2
      app/build.gradle
  2. 8
      app/src/main/java/acr/browser/lightning/download/WebAddress.java
  3. 2
      app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java
  4. 2
      app/src/main/java/acr/browser/lightning/reading/SHelper.java
  5. 2
      app/src/main/java/acr/browser/lightning/utils/IntentUtils.java
  6. 2
      app/src/main/java/acr/browser/lightning/utils/UrlUtils.java

2
app/build.gradle

@ -40,7 +40,7 @@ android { @@ -40,7 +40,7 @@ android {
}
}
lintOptions {
abortOnError false
abortOnError true
}
}

8
app/src/main/java/acr/browser/lightning/download/WebAddress.java

@ -35,11 +35,11 @@ class WebAddress { @@ -35,11 +35,11 @@ class WebAddress {
private static final int MATCH_GROUP_PORT = 4;
private static final int MATCH_GROUP_PATH = 5;
private static final Pattern sAddressPattern = Pattern.compile(
/* scheme */"(?:(http|https|file)\\:\\/\\/)?" +
/* authority */"(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
/* scheme */"(?:(http|https|file)://)?" +
/* authority */"(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?::[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
/* host */"([" + GOOD_IRI_CHAR + "%_-][" + GOOD_IRI_CHAR + "%_\\.-]*|\\[[0-9a-fA-F:\\.]+\\])?" +
/* port */"(?:\\:([0-9]*))?" +
/* path */"(\\/?[^#]*)?" +
/* port */"(?::([0-9]*))?" +
/* path */"(/?[^#]*)?" +
/* anchor */".*", Pattern.CASE_INSENSITIVE);
/**

2
app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java

@ -23,7 +23,7 @@ public class OutputFormatter { @@ -23,7 +23,7 @@ public class OutputFormatter {
private static final int MIN_FIRST_PARAGRAPH_TEXT = 50; // Min size of first paragraph
private static final int MIN_PARAGRAPH_TEXT = 30; // Min size of any other paragraphs
private static final List<String> NODES_TO_REPLACE = Arrays.asList("strong", "b", "i");
private Pattern unlikelyPattern = Pattern.compile("display\\:none|visibility\\:hidden");
private Pattern unlikelyPattern = Pattern.compile("display:none|visibility:hidden");
private final int minFirstParagraphText;
private final int minParagraphText;
private final List<String> nodesToReplace;

2
app/src/main/java/acr/browser/lightning/reading/SHelper.java

@ -253,7 +253,7 @@ class SHelper { @@ -253,7 +253,7 @@ class SHelper {
public static String getUrlFromUglyGoogleRedirect(String url) {
if (url.startsWith("http://www.google.com/url?")) {
url = url.substring("http://www.google.com/url?".length());
String arr[] = urlDecode(url).split("\\&");
String arr[] = urlDecode(url).split("&");
for (String str : arr) {
if (str.startsWith("q="))
return str.substring("q=".length());

2
app/src/main/java/acr/browser/lightning/utils/IntentUtils.java

@ -24,7 +24,7 @@ public class IntentUtils { @@ -24,7 +24,7 @@ public class IntentUtils {
+ // switch on case insensitive matching
'('
+ // begin group for schema
"(?:http|https|file):\\/\\/" + "|(?:inline|data|about|javascript):" + "|(?:.*:.*@)"
"(?:http|https|file)://" + "|(?:inline|data|about|javascript):" + "|(?:.*:.*@)"
+ ')' + "(.*)");
public IntentUtils(Activity activity) {

2
app/src/main/java/acr/browser/lightning/utils/UrlUtils.java

@ -28,7 +28,7 @@ public class UrlUtils { @@ -28,7 +28,7 @@ public class UrlUtils {
private static final Pattern ACCEPTED_URI_SCHEMA = Pattern.compile(
"(?i)" + // switch on case insensitive matching
'(' + // begin group for schema
"(?:http|https|file):\\/\\/" +
"(?:http|https|file)://" +
"|(?:inline|data|about|javascript):" +
"|(?:.*:.*@)" +
')' +

Loading…
Cancel
Save