replace Subscription to CompositeSubscription where it is needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/2eca314e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2eca314e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2eca314e Branch: refs/heads/master Commit: 2eca314e79d488e871c50198a4a7774f43465f10 Parents: feed116 Author: Sagar <kumarsagar15...@gmail.com> Authored: Thu Jul 21 22:52:18 2016 +0530 Committer: Sagar <kumarsagar15...@gmail.com> Committed: Thu Jul 21 22:52:18 2016 +0530 ---------------------------------------------------------------------- .../ui/anouncements/AnnouncementPresenter.java | 14 +++++---- .../FavouriteWorkflowDetailPresenter.java | 31 ++++++++++++-------- .../workflowdetail/WorkflowDetailPresenter.java | 29 +++++++++--------- 3 files changed, 41 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2eca314e/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java index c8ca5a7..97b9a5d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java @@ -26,20 +26,22 @@ import org.apache.taverna.mobile.ui.base.BasePresenter; import android.util.Log; import rx.Observer; -import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import rx.subscriptions.CompositeSubscription; public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { public final String LOG_TAG = getClass().getSimpleName(); private DataManager mDataManager; - private Subscription mSubscriptions; + private CompositeSubscription mSubscriptions; public AnnouncementPresenter(DataManager dataManager) { mDataManager = dataManager; + + mSubscriptions = new CompositeSubscription(); } @Override @@ -55,7 +57,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { public void loadAllAnnouncement(int pageNumber) { - mSubscriptions = mDataManager.getAllAnnouncement(pageNumber) + mSubscriptions.add(mDataManager.getAllAnnouncement(pageNumber) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Announcements>() { @@ -76,12 +78,12 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { getMvpView().showAllAnouncement(announcement); Log.d(LOG_TAG, announcement.getAnnouncement().get(1).getResource()); } - }); + })); } public void loadAnnouncementDetails(String id) { - mSubscriptions = mDataManager.getAnnouncementDetail(id) + mSubscriptions.add(mDataManager.getAnnouncementDetail(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<DetailAnnouncement>() { @@ -102,7 +104,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { getMvpView().showAnnouncementDetail(detailAnnouncement); } - }); + })); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2eca314e/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java index 05ce59d..91905d1 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java @@ -28,20 +28,25 @@ import java.util.HashMap; import java.util.Map; import rx.Observer; -import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import rx.subscriptions.CompositeSubscription; public class FavouriteWorkflowDetailPresenter extends BasePresenter<FavouriteWorkflowDetailMvpView> { public final String LOG_TAG = getClass().getSimpleName(); + private DataManager mDataManager; - private Subscription mSubscriptions; + + private CompositeSubscription mCompositeSubscription; public FavouriteWorkflowDetailPresenter(DataManager dataManager) { + mDataManager = dataManager; + + mCompositeSubscription = new CompositeSubscription(); } @Override @@ -52,13 +57,13 @@ public class FavouriteWorkflowDetailPresenter extends @Override public void detachView() { super.detachView(); - if (mSubscriptions != null) mSubscriptions.unsubscribe(); + if (mCompositeSubscription != null) mCompositeSubscription.unsubscribe(); } public void loadWorkflowDetail(String id) { getMvpView().showProgressbar(true); - mSubscriptions = mDataManager.getFavoriteDetailWorkflow(id) + mCompositeSubscription.add(mDataManager.getFavoriteDetailWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Workflow>() { @@ -78,7 +83,7 @@ public class FavouriteWorkflowDetailPresenter extends loadUserDetail(workflow.getUploader().getId()); getFavourite(workflow.getId()); } - }); + })); } @@ -86,7 +91,7 @@ public class FavouriteWorkflowDetailPresenter extends getMvpView().showProgressbar(true); - mSubscriptions = mDataManager.getUserDetail(id, getUserQueryOptions()) + mCompositeSubscription.add(mDataManager.getUserDetail(id, getUserQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<User>() { @@ -106,14 +111,14 @@ public class FavouriteWorkflowDetailPresenter extends public void onNext(User user) { getMvpView().setImage(user); } - }); + })); } public void loadLicenseDetail(String id) { getMvpView().showLicenseProgress(true); - mSubscriptions = mDataManager.getLicenseDetail(id, getLicenceQueryOptions()) + mCompositeSubscription.add(mDataManager.getLicenseDetail(id, getLicenceQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<License>() { @@ -133,13 +138,13 @@ public class FavouriteWorkflowDetailPresenter extends public void onNext(License license) { getMvpView().showLicense(license); } - }); + })); } public void setFavourite(String id) { - mSubscriptions = mDataManager.setFavoriteWorkflow(id) + mCompositeSubscription.add(mDataManager.setFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Boolean>() { @@ -164,13 +169,13 @@ public class FavouriteWorkflowDetailPresenter extends } } - }); + })); } public void getFavourite(String id) { - mSubscriptions = mDataManager.getFavoriteWorkflow(id) + mCompositeSubscription.add(mDataManager.getFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Boolean>() { @@ -189,7 +194,7 @@ public class FavouriteWorkflowDetailPresenter extends public void onNext(Boolean b) { getMvpView().getFavouriteIcon(b); } - }); + })); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2eca314e/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java index 0515244..0850e96 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java @@ -28,19 +28,21 @@ import java.util.HashMap; import java.util.Map; import rx.Observer; -import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import rx.subscriptions.CompositeSubscription; public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView> { public final String LOG_TAG = getClass().getSimpleName(); private DataManager mDataManager; - private Subscription mSubscriptions; + private CompositeSubscription mCompositeSubscription; public WorkflowDetailPresenter(DataManager dataManager) { + mDataManager = dataManager; + mCompositeSubscription = new CompositeSubscription(); } @Override @@ -51,13 +53,13 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView @Override public void detachView() { super.detachView(); - if (mSubscriptions != null) mSubscriptions.unsubscribe(); + if (mCompositeSubscription != null) mCompositeSubscription.unsubscribe(); } public void loadWorkflowDetail(String id) { getMvpView().showProgressbar(true); - mSubscriptions = mDataManager.getDetailWorkflow(id, getDetailQueryOptions()) + mCompositeSubscription.add(mDataManager.getDetailWorkflow(id, getDetailQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Workflow>() { @@ -77,15 +79,14 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView loadUserDetail(workflow.getUploader().getId()); getFavourite(workflow.getId()); } - }); - + })); } private void loadUserDetail(String id) { getMvpView().showProgressbar(true); - mSubscriptions = mDataManager.getUserDetail(id, getUserQueryOptions()) + mCompositeSubscription.add(mDataManager.getUserDetail(id, getUserQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<User>() { @@ -105,14 +106,14 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void onNext(User user) { getMvpView().setImage(user); } - }); + })); } public void loadLicenseDetail(String id) { getMvpView().showLicenseProgress(true); - mSubscriptions = mDataManager.getLicenseDetail(id, getLicenceQueryOptions()) + mCompositeSubscription.add(mDataManager.getLicenseDetail(id, getLicenceQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<License>() { @@ -132,13 +133,13 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void onNext(License license) { getMvpView().showLicense(license); } - }); + })); } public void setFavourite(String id) { - mSubscriptions = mDataManager.setFavoriteWorkflow(id) + mCompositeSubscription.add(mDataManager.setFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Boolean>() { @@ -163,13 +164,13 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView } } - }); + })); } public void getFavourite(String id) { - mSubscriptions = mDataManager.getFavoriteWorkflow(id) + mCompositeSubscription.add(mDataManager.getFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Boolean>() { @@ -188,7 +189,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void onNext(Boolean b) { getMvpView().getFavouriteIcon(b); } - }); + })); } private Map<String, String> getDetailQueryOptions() {
