Merge Pull Request #93 into develop

2016-06-11 13:50:00 +00:00
parent 6bf5bebecd 950133b30a
commit 7dbb7ff735
4 changed files with 25 additions and 4 deletions
@@ -100,6 +100,17 @@ public class NetworkService {
     * @param test Whether to test that the redirection works.
     */
    public synchronized void initUrlRedirection(boolean test) {
+
+        if (true) {
+            // This feature isn't currently supported, since it's a public service of subsonic.org
+            // Display a warning message for now
+            boolean enabled = settingsService.isUrlRedirectionEnabled() && settingsService.getUrlRedirectType() == UrlRedirectType.NORMAL;
+            if (enabled) {
+                LOG.warn("The URL redirection service is currently not enabled!");
+            }
+            return;
+        }
+
        urlRedirectionStatus.setText("Idle");
        if (urlRedirectionFuture != null) {
            urlRedirectionFuture.cancel(true);