diff options
| -rw-r--r-- | subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java index afb5cdc7..a0b3e8d5 100644 --- a/subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java +++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java @@ -607,14 +607,11 @@ public class SettingsService { } public boolean isLicenseValid() { - return isLicenseValid(getLicenseEmail(), getLicenseCode()) && licenseValidated; + return true; } public boolean isLicenseValid(String email, String license) { - if (email == null || license == null) { - return false; - } - return license.equalsIgnoreCase(StringUtil.md5Hex(email.toLowerCase())); + return true; } public String getDownsamplingCommand() { @@ -1194,33 +1191,7 @@ public class SettingsService { } private void validateLicense() { - String email = getLicenseEmail(); - Date date = getLicenseDate(); - - if (email == null || date == null) { - licenseValidated = false; - return; - } - licenseValidated = true; - - HttpClient client = new DefaultHttpClient(); - HttpConnectionParams.setConnectionTimeout(client.getParams(), 120000); - HttpConnectionParams.setSoTimeout(client.getParams(), 120000); - HttpGet method = new HttpGet("http://subsonic.org/backend/validateLicense.view" + "?email=" + StringUtil.urlEncode(email) + - "&date=" + date.getTime() + "&version=" + versionService.getLocalVersion()); - try { - ResponseHandler<String> responseHandler = new BasicResponseHandler(); - String content = client.execute(method, responseHandler); - licenseValidated = content != null && content.contains("true"); - if (!licenseValidated) { - LOG.warn("License key is not valid."); - } - } catch (Throwable x) { - LOG.warn("Failed to validate license.", x); - } finally { - client.getConnectionManager().shutdown(); - } } public void validateLicenseAsync() { |