Merge pull request #13 from MindorksOpenSource/development

Update Fast-Android-Networking library to use Single

app/src/main/java/com/mindorks/framework/mvvm/data/AppDataManager.java

@@ -46,6 +46,7 @@ import javax.inject.Singleton;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
+import io.reactivex.Single;
 import io.reactivex.functions.BiFunction;
 import io.reactivex.functions.Function;
 
@@ -98,25 +99,25 @@ public class AppDataManager implements DataManager {
     }
 
     @Override
-    public Observable<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest
-                                                                  request) {
+    public Single<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest
+                                                              request) {
         return mApiHelper.doGoogleLoginApiCall(request);
     }
 
     @Override
-    public Observable<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest
-                                                                    request) {
+    public Single<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest
+                                                                request) {
         return mApiHelper.doFacebookLoginApiCall(request);
     }
 
     @Override
-    public Observable<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest
-                                                                  request) {
+    public Single<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest
+                                                              request) {
         return mApiHelper.doServerLoginApiCall(request);
     }
 
     @Override
-    public Observable<LogoutResponse> doLogoutApiCall() {
+    public Single<LogoutResponse> doLogoutApiCall() {
         return mApiHelper.doLogoutApiCall();
     }
 
@@ -301,12 +302,12 @@ public class AppDataManager implements DataManager {
     }
 
     @Override
-    public Observable<BlogResponse> getBlogApiCall() {
+    public Single<BlogResponse> getBlogApiCall() {
         return mApiHelper.getBlogApiCall();
     }
 
     @Override
-    public Observable<OpenSourceResponse> getOpenSourceApiCall() {
+    public Single<OpenSourceResponse> getOpenSourceApiCall() {
         return mApiHelper.getOpenSourceApiCall();
     }
 

app/src/main/java/com/mindorks/framework/mvvm/data/remote/ApiHelper.java

@@ -16,14 +16,13 @@
 
 package com.mindorks.framework.mvvm.data.remote;
 
-import com.mindorks.framework.mvvm.data.remote.ApiHeader;
 import com.mindorks.framework.mvvm.data.model.api.BlogResponse;
 import com.mindorks.framework.mvvm.data.model.api.LoginRequest;
 import com.mindorks.framework.mvvm.data.model.api.LoginResponse;
 import com.mindorks.framework.mvvm.data.model.api.LogoutResponse;
 import com.mindorks.framework.mvvm.data.model.api.OpenSourceResponse;
 
-import io.reactivex.Observable;
+import io.reactivex.Single;
 
 /**
  * Created by amitshekhar on 07/07/17.
@@ -33,15 +32,15 @@ public interface ApiHelper {
 
     ApiHeader getApiHeader();
 
-    Observable<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest request);
+    Single<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest request);
 
-    Observable<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest request);
+    Single<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest request);
 
-    Observable<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest request);
+    Single<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest request);
 
-    Observable<LogoutResponse> doLogoutApiCall();
+    Single<LogoutResponse> doLogoutApiCall();
 
-    Observable<BlogResponse> getBlogApiCall();
+    Single<BlogResponse> getBlogApiCall();
 
-    Observable<OpenSourceResponse> getOpenSourceApiCall();
+    Single<OpenSourceResponse> getOpenSourceApiCall();
 }

app/src/main/java/com/mindorks/framework/mvvm/data/remote/AppApiHelper.java

@@ -26,7 +26,7 @@ import com.rx2androidnetworking.Rx2AndroidNetworking;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.Single;
 
 /**
  * Created by amitshekhar on 07/07/17.
@@ -48,56 +48,56 @@ public class AppApiHelper implements ApiHelper {
     }
 
     @Override
-    public Observable<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest
-                                                                  request) {
+    public Single<LoginResponse> doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest
+                                                              request) {
         return Rx2AndroidNetworking.post(ApiEndPoint.ENDPOINT_GOOGLE_LOGIN)
                 .addHeaders(mApiHeader.getPublicApiHeader())
                 .addBodyParameter(request)
                 .build()
-                .getObjectObservable(LoginResponse.class);
+                .getObjectSingle(LoginResponse.class);
     }
 
     @Override
-    public Observable<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest
-                                                                    request) {
+    public Single<LoginResponse> doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest
+                                                                request) {
         return Rx2AndroidNetworking.post(ApiEndPoint.ENDPOINT_FACEBOOK_LOGIN)
                 .addHeaders(mApiHeader.getPublicApiHeader())
                 .addBodyParameter(request)
                 .build()
-                .getObjectObservable(LoginResponse.class);
+                .getObjectSingle(LoginResponse.class);
     }
 
     @Override
-    public Observable<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest
-                                                                  request) {
+    public Single<LoginResponse> doServerLoginApiCall(LoginRequest.ServerLoginRequest
+                                                              request) {
         return Rx2AndroidNetworking.post(ApiEndPoint.ENDPOINT_SERVER_LOGIN)
                 .addHeaders(mApiHeader.getPublicApiHeader())
                 .addBodyParameter(request)
                 .build()
-                .getObjectObservable(LoginResponse.class);
+                .getObjectSingle(LoginResponse.class);
     }
 
     @Override
-    public Observable<LogoutResponse> doLogoutApiCall() {
+    public Single<LogoutResponse> doLogoutApiCall() {
         return Rx2AndroidNetworking.post(ApiEndPoint.ENDPOINT_LOGOUT)
                 .addHeaders(mApiHeader.getProtectedApiHeader())
                 .build()
-                .getObjectObservable(LogoutResponse.class);
+                .getObjectSingle(LogoutResponse.class);
     }
 
     @Override
-    public Observable<BlogResponse> getBlogApiCall() {
+    public Single<BlogResponse> getBlogApiCall() {
         return Rx2AndroidNetworking.get(ApiEndPoint.ENDPOINT_BLOG)
                 .addHeaders(mApiHeader.getProtectedApiHeader())
                 .build()
-                .getObjectObservable(BlogResponse.class);
+                .getObjectSingle(BlogResponse.class);
     }
 
     @Override
-    public Observable<OpenSourceResponse> getOpenSourceApiCall() {
+    public Single<OpenSourceResponse> getOpenSourceApiCall() {
         return Rx2AndroidNetworking.get(ApiEndPoint.ENDPOINT_OPEN_SOURCE)
                 .addHeaders(mApiHeader.getProtectedApiHeader())
                 .build()
-                .getObjectObservable(OpenSourceResponse.class);
+                .getObjectSingle(OpenSourceResponse.class);
     }
 }

build.gradle

@@ -55,7 +55,7 @@ ext {
     calligraphyVersion = '2.2.0'
     glideVersion = '3.7.0'
     roomDatabase = '1.0.0-beta2'
-    rx2FastAndroidNetworking = '1.0.0'
+    rx2FastAndroidNetworking = '1.0.1'
 
     dagger2Version = '2.11'
     rxjava2Version = '2.0.6'