aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-05-29 14:59:37 +1200
committerGitHub <noreply@github.com>2018-05-29 14:59:37 +1200
commit03b3ab6adfc0083ae51f6274abc280668553bc58 (patch)
tree0aa594acb619809d4ef9d1297e10ebc5565fef93 /src/org/traccar
parent744af6b29ad3566e001495c18be8551159c2cc2d (diff)
parentd705a60f27403392559cd64e0674ec75118de042 (diff)
downloadtrackermap-server-03b3ab6adfc0083ae51f6274abc280668553bc58.tar.gz
trackermap-server-03b3ab6adfc0083ae51f6274abc280668553bc58.tar.bz2
trackermap-server-03b3ab6adfc0083ae51f6274abc280668553bc58.zip
Merge pull request #3895 from siilats/master
Allow - in token to use UDID from Xcode as token
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/model/User.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 99e12a072..976b6aac0 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -203,7 +203,7 @@ public class User extends ExtendedModel {
public void setToken(String token) {
if (token != null && !token.isEmpty()) {
- if (!token.matches("^[a-zA-Z0-9]{16,}$")) {
+ if (!token.matches("^[a-zA-Z0-9-]{16,}$")) {
throw new IllegalArgumentException("Illegal token");
}
this.token = token;