Add using new api for ping call.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>

ultrasonic/build.gradle

@@ -21,6 +21,10 @@ android {
     sourceSets {
         test.java.srcDirs += 'src/test/kotlin'
     }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+    }
 }
 
 dependencies {

ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java

@@ -19,20 +19,61 @@
 package org.moire.ultrasonic.service;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 
+import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient;
+import org.moire.ultrasonic.api.subsonic.SubsonicAPIVersions;
+import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.Util;
 
 /**
  * @author Sindre Mehus
  * @version $Id$
  */
-public class MusicServiceFactory
+public class MusicServiceFactory {
-{
+    private static MusicService REST_MUSIC_SERVICE = null;
-	private static final MusicService REST_MUSIC_SERVICE = new CachedMusicService(new RESTMusicService());
+    private static MusicService OFFLINE_MUSIC_SERVICE = null;
-	private static final MusicService OFFLINE_MUSIC_SERVICE = new OfflineMusicService();
 
-	public static MusicService getMusicService(Context context)
+    public static MusicService getMusicService(Context context) {
-	{
+        if (Util.isOffline(context)) {
-		return Util.isOffline(context) ? OFFLINE_MUSIC_SERVICE : REST_MUSIC_SERVICE;
+            if (OFFLINE_MUSIC_SERVICE == null) {
+                synchronized (MusicServiceFactory.class) {
+                    if (OFFLINE_MUSIC_SERVICE == null) {
+                        OFFLINE_MUSIC_SERVICE = new OfflineMusicService(createSubsonicApiClient(context));
+                    }
+                }
+            }
+
+            return OFFLINE_MUSIC_SERVICE;
+        } else {
+            if (REST_MUSIC_SERVICE == null) {
+                synchronized (MusicServiceFactory.class) {
+                    if (REST_MUSIC_SERVICE == null) {
+                        REST_MUSIC_SERVICE = new CachedMusicService(new RESTMusicService(
+                                createSubsonicApiClient(context)));
+                    }
+                }
+            }
+
+            return REST_MUSIC_SERVICE;
+        }
+    }
+
+    private static SubsonicAPIClient createSubsonicApiClient(final Context context) {
+        final SharedPreferences preferences = Util.getPreferences(context);
+        int instance = preferences.getInt(Constants.PREFERENCES_KEY_SERVER_INSTANCE, 1);
+        String serverUrl = preferences.getString(Constants.PREFERENCES_KEY_SERVER_URL + instance, null);
+        String username = preferences.getString(Constants.PREFERENCES_KEY_USERNAME + instance, null);
+        String password = preferences.getString(Constants.PREFERENCES_KEY_PASSWORD + instance, null);
+
+        if (serverUrl == null ||
+                username == null ||
+                password == null) {
+            throw new IllegalStateException("Server connection data is not available!");
+        }
+
+        return new SubsonicAPIClient(serverUrl, username, password,
+                SubsonicAPIVersions.fromApiVersion(Constants.REST_PROTOCOL_VERSION),
+                Constants.REST_CLIENT_ID, true);
     }
 }

ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java

@@ -23,6 +23,7 @@ import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.util.Log;
 
+import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient;
 import org.moire.ultrasonic.domain.Artist;
 import org.moire.ultrasonic.domain.Genre;
 import org.moire.ultrasonic.domain.Indexes;
@@ -66,6 +67,10 @@ public class OfflineMusicService extends RESTMusicService
 	private static final String TAG = OfflineMusicService.class.getSimpleName();
 	private static final Pattern COMPILE = Pattern.compile(" ");
 
+    public OfflineMusicService(SubsonicAPIClient subsonicAPIClient) {
+        super(subsonicAPIClient);
+    }
+
     @Override
 	public boolean isLicenseValid(Context context, ProgressListener progressListener) throws Exception
 	{

ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java

@@ -23,10 +23,38 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.params.ConnManagerParams;
+import org.apache.http.conn.params.ConnPerRouteBean;
+import org.apache.http.conn.scheme.PlainSocketFactory;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.scheme.SocketFactory;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
+import org.apache.http.protocol.HttpContext;
 import org.moire.ultrasonic.R;
-import org.moire.ultrasonic.Test.service.GetPodcastEpisodesTestReaderProvider;
+import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient;
+import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse;
 import org.moire.ultrasonic.domain.Bookmark;
 import org.moire.ultrasonic.domain.ChatMessage;
 import org.moire.ultrasonic.domain.Genre;
@@ -36,7 +64,6 @@ import org.moire.ultrasonic.domain.Lyrics;
 import org.moire.ultrasonic.domain.MusicDirectory;
 import org.moire.ultrasonic.domain.MusicFolder;
 import org.moire.ultrasonic.domain.Playlist;
-import org.moire.ultrasonic.domain.PodcastEpisode;
 import org.moire.ultrasonic.domain.PodcastsChannel;
 import org.moire.ultrasonic.domain.SearchCriteria;
 import org.moire.ultrasonic.domain.SearchResult;
@@ -71,36 +98,8 @@ import org.moire.ultrasonic.util.CancellableTask;
 import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.FileUtil;
 import org.moire.ultrasonic.util.ProgressListener;
-import org.moire.ultrasonic.util.StreamProxy;
 import org.moire.ultrasonic.util.Util;
 
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.params.ConnManagerParams;
-import org.apache.http.conn.params.ConnPerRouteBean;
-import org.apache.http.conn.scheme.PlainSocketFactory;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.scheme.SocketFactory;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.ExecutionContext;
-import org.apache.http.protocol.HttpContext;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -110,8 +109,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
-import java.io.StringReader;
-import java.lang.reflect.Array;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -119,9 +116,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
+import retrofit2.Response;
+
 import static java.util.Arrays.asList;
 
 /**
@@ -155,9 +153,10 @@ public class RESTMusicService implements MusicService
 	private String redirectFrom;
 	private String redirectTo;
 	private final ThreadSafeClientConnManager connManager;
+    private SubsonicAPIClient subsonicAPIClient;
 
-	public RESTMusicService()
+    public RESTMusicService(SubsonicAPIClient subsonicAPIClient) {
-	{
+        this.subsonicAPIClient = subsonicAPIClient;
 
         // Create and initialize default HTTP parameters
 		HttpParams params = new BasicHttpParams();
@@ -196,16 +195,13 @@ public class RESTMusicService implements MusicService
 	}
 
     @Override
-	public void ping(Context context, ProgressListener progressListener) throws Exception
+    public void ping(Context context, ProgressListener progressListener) throws Exception {
-	{
+        updateProgressListener(progressListener);
-		Reader reader = getReader(context, progressListener, "ping", null);
+
-		try
+        final Response<SubsonicResponse> response = subsonicAPIClient.getApi().ping().execute();
-		{
+        if (!response.isSuccessful() ||
-			new ErrorParser(context).parse(reader);
+                response.body().getStatus() == SubsonicResponse.Status.ERROR) {
-		}
+            throw new IOException("Ping request failed");
-		finally
-		{
-			Util.close(reader);
         }
     }
 
@@ -1788,4 +1784,9 @@ public class RESTMusicService implements MusicService
 		}
 	}
 
+    private void updateProgressListener(@Nullable final ProgressListener progressListener) {
+        if (progressListener != null) {
+            progressListener.updateProgress(R.string.service_connecting);
+        }
+    }
 }