Сравнить коммиты
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
e5bddc5aa6 | ||
|
|
3b1ba21a76 | ||
|
|
26467740fa | ||
|
|
a8d6f0b82d | ||
|
|
94acc71f8c |
@@ -7,8 +7,8 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 3
|
minSdkVersion 3
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 33
|
versionCode 34
|
||||||
versionName '4.0'
|
versionName '4.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ import android.preference.PreferenceActivity;
|
|||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.preference.TwoStatePreference;
|
import android.preference.TwoStatePreference;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.Patterns;
|
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.traccar.client;
|
||||||
|
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
public class Patterns {
|
||||||
|
|
||||||
|
private static final String IP_ADDRESS_STRING =
|
||||||
|
"((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4]"
|
||||||
|
+ "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]"
|
||||||
|
+ "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"
|
||||||
|
+ "|[1-9][0-9]|[0-9]))";
|
||||||
|
|
||||||
|
private static final String UCS_CHAR = "[" +
|
||||||
|
"\u00A0-\uD7FF" +
|
||||||
|
"\uF900-\uFDCF" +
|
||||||
|
"\uFDF0-\uFFEF" +
|
||||||
|
"\uD800\uDC00-\uD83F\uDFFD" +
|
||||||
|
"\uD840\uDC00-\uD87F\uDFFD" +
|
||||||
|
"\uD880\uDC00-\uD8BF\uDFFD" +
|
||||||
|
"\uD8C0\uDC00-\uD8FF\uDFFD" +
|
||||||
|
"\uD900\uDC00-\uD93F\uDFFD" +
|
||||||
|
"\uD940\uDC00-\uD97F\uDFFD" +
|
||||||
|
"\uD980\uDC00-\uD9BF\uDFFD" +
|
||||||
|
"\uD9C0\uDC00-\uD9FF\uDFFD" +
|
||||||
|
"\uDA00\uDC00-\uDA3F\uDFFD" +
|
||||||
|
"\uDA40\uDC00-\uDA7F\uDFFD" +
|
||||||
|
"\uDA80\uDC00-\uDABF\uDFFD" +
|
||||||
|
"\uDAC0\uDC00-\uDAFF\uDFFD" +
|
||||||
|
"\uDB00\uDC00-\uDB3F\uDFFD" +
|
||||||
|
"\uDB44\uDC00-\uDB7F\uDFFD" +
|
||||||
|
"&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]";
|
||||||
|
|
||||||
|
private static final String LABEL_CHAR = "a-zA-Z0-9" + UCS_CHAR;
|
||||||
|
|
||||||
|
private static final String IRI_LABEL =
|
||||||
|
"[" + LABEL_CHAR + "](?:[" + LABEL_CHAR + "\\-]{0,61}[" + LABEL_CHAR + "]){0,1}";
|
||||||
|
|
||||||
|
private static final String RELAXED_DOMAIN_NAME =
|
||||||
|
"(?:" + "(?:" + IRI_LABEL + "(?:\\.(?=\\S))" +"?)+" + "|" + IP_ADDRESS_STRING + ")";
|
||||||
|
|
||||||
|
public static final Pattern DOMAIN_NAME = Pattern.compile(RELAXED_DOMAIN_NAME);
|
||||||
|
|
||||||
|
}
|
||||||
+3
-3
@@ -2,15 +2,15 @@
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.2.0'
|
classpath 'com.android.tools.build:gradle:2.2.3'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
jcenter()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user