Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 18:58:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify UserAgentUtil

Browse Source
This commit is contained in:
Jon Chambers
2025-04-15 16:41:51 -04:00
committed by Jon Chambers
parent f5e49b6db7
commit 05c74f1997
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service/src/main/java/org/whispersystems/textsecuregcm/util/ua/UserAgentUtil.java
View File

@@ -5,7 +5,6 @@
package org.whispersystems.textsecuregcm.util.ua;
import com.google.common.annotations.VisibleForTesting;
import com.vdurmont.semver4j.Semver;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -21,10 +20,10 @@ public class UserAgentUtil {
}
try {
final UserAgent standardUserAgent = parseStandardUserAgentString(userAgentString);
final Matcher matcher = STANDARD_UA_PATTERN.matcher(userAgentString);
if (standardUserAgent != null) {
return standardUserAgent;
if (matcher.matches()) {
return new UserAgent(ClientPlatform.valueOf(matcher.group(1).toUpperCase()), new Semver(matcher.group(2)), StringUtils.stripToNull(matcher.group(4)));
}
} catch (final Exception e) {
throw new UnrecognizedUserAgentException(e);
@@ -32,15 +31,4 @@ public class UserAgentUtil {
throw new UnrecognizedUserAgentException();
}
@VisibleForTesting
static UserAgent parseStandardUserAgentString(final String userAgentString) {
final Matcher matcher = STANDARD_UA_PATTERN.matcher(userAgentString);
if (matcher.matches()) {
return new UserAgent(ClientPlatform.valueOf(matcher.group(1).toUpperCase()), new Semver(matcher.group(2)), StringUtils.stripToNull(matcher.group(4)));
}
return null;
}
}