diff --git a/app/src/main/java/com/mindorks/framework/mvvm/data/AppDataManager.java b/app/src/main/java/com/mindorks/framework/mvvm/data/AppDataManager.java index 67f605fa4dedec15736137e659e900f6d15baa27..de2dc237303e7270f16450146c259fdeb42b70cc 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/data/AppDataManager.java +++ b/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 doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest - request) { + public Single doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest + request) { return mApiHelper.doGoogleLoginApiCall(request); } @Override - public Observable doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest - request) { + public Single doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest + request) { return mApiHelper.doFacebookLoginApiCall(request); } @Override - public Observable doServerLoginApiCall(LoginRequest.ServerLoginRequest - request) { + public Single doServerLoginApiCall(LoginRequest.ServerLoginRequest + request) { return mApiHelper.doServerLoginApiCall(request); } @Override - public Observable doLogoutApiCall() { + public Single doLogoutApiCall() { return mApiHelper.doLogoutApiCall(); } @@ -301,12 +302,12 @@ public class AppDataManager implements DataManager { } @Override - public Observable getBlogApiCall() { + public Single getBlogApiCall() { return mApiHelper.getBlogApiCall(); } @Override - public Observable getOpenSourceApiCall() { + public Single getOpenSourceApiCall() { return mApiHelper.getOpenSourceApiCall(); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/data/remote/ApiHelper.java b/app/src/main/java/com/mindorks/framework/mvvm/data/remote/ApiHelper.java index 249824edcdd7c4678464abc34491b08a94e76346..2d1f9b46915f26a74e0ed6d1bbde2c726a66fb65 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/data/remote/ApiHelper.java +++ b/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 doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest request); + Single doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest request); - Observable doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest request); + Single doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest request); - Observable doServerLoginApiCall(LoginRequest.ServerLoginRequest request); + Single doServerLoginApiCall(LoginRequest.ServerLoginRequest request); - Observable doLogoutApiCall(); + Single doLogoutApiCall(); - Observable getBlogApiCall(); + Single getBlogApiCall(); - Observable getOpenSourceApiCall(); + Single getOpenSourceApiCall(); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/data/remote/AppApiHelper.java b/app/src/main/java/com/mindorks/framework/mvvm/data/remote/AppApiHelper.java index 56ee92fd2674b85cc15c98e722b72b5b1d4e29ac..336f39ce2d56357c15671d93fb809115e13fc256 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/data/remote/AppApiHelper.java +++ b/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 doGoogleLoginApiCall(LoginRequest.GoogleLoginRequest - request) { + public Single 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 doFacebookLoginApiCall(LoginRequest.FacebookLoginRequest - request) { + public Single 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 doServerLoginApiCall(LoginRequest.ServerLoginRequest - request) { + public Single 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 doLogoutApiCall() { + public Single doLogoutApiCall() { return Rx2AndroidNetworking.post(ApiEndPoint.ENDPOINT_LOGOUT) .addHeaders(mApiHeader.getProtectedApiHeader()) .build() - .getObjectObservable(LogoutResponse.class); + .getObjectSingle(LogoutResponse.class); } @Override - public Observable getBlogApiCall() { + public Single getBlogApiCall() { return Rx2AndroidNetworking.get(ApiEndPoint.ENDPOINT_BLOG) .addHeaders(mApiHeader.getProtectedApiHeader()) .build() - .getObjectObservable(BlogResponse.class); + .getObjectSingle(BlogResponse.class); } @Override - public Observable getOpenSourceApiCall() { + public Single getOpenSourceApiCall() { return Rx2AndroidNetworking.get(ApiEndPoint.ENDPOINT_OPEN_SOURCE) .addHeaders(mApiHeader.getProtectedApiHeader()) .build() - .getObjectObservable(OpenSourceResponse.class); + .getObjectSingle(OpenSourceResponse.class); } } diff --git a/build.gradle b/build.gradle index 9c4580b46468bb6ce61c6b1f0248d2b9e4952b4e..87115dc6dd306e5c3ab5694a54901bf772c85f67 100644 --- a/build.gradle +++ b/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'