remove DB error
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/e864a5ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e864a5ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e864a5ce Branch: refs/heads/master Commit: e864a5ce9e7fc3adfe858dadb6084ec4fd1e6d79 Parents: bc28bdb Author: Sagar <[email protected]> Authored: Mon Jul 4 22:59:10 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jul 4 22:59:10 2016 +0530 ---------------------------------------------------------------------- .../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 1 - .../mobile/ui/workflowdetail/WorkflowDetailPresenter.java | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e864a5ce/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index de038fe..d135865 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -130,7 +130,6 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv if (mConnectionInfo.isConnectingToInternet()) { mWorkflowDetailPresenter.loadWorkflowDetail(id); - mWorkflowDetailPresenter.getFavourite(id); } else { mProgressBar.setVisibility(View.GONE); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e864a5ce/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 43fcd37..519e41f 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 @@ -38,7 +38,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void loadWorkflowDetail(String id) { getMvpView().showProgressbar(true); - if (mSubscriptions != null) mSubscriptions.unsubscribe(); + mSubscriptions = mDataManager.getDetailWorkflow(id, getDetailQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -57,6 +57,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void onNext(Workflow workflow) { getMvpView().showWorkflowDetail(workflow); loadUserDetail(workflow.getUploader().getId()); + getFavourite(workflow.getId()); } }); @@ -65,7 +66,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView private void loadUserDetail(String id) { getMvpView().showProgressbar(true); - if (mSubscriptions != null) mSubscriptions.unsubscribe(); + mSubscriptions = mDataManager.getUserDetail(id, getUserQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -90,9 +91,9 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView } public void loadLicenseDetail(String id) { + getMvpView().showLicenseProgress(true); - if (mSubscriptions != null) mSubscriptions.unsubscribe(); mSubscriptions = mDataManager.getLicenseDetail(id, getLicenceQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -118,7 +119,6 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void setFavourite(String id) { - if (mSubscriptions != null) mSubscriptions.unsubscribe(); mSubscriptions = mDataManager.setFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread()) @@ -139,7 +139,6 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void onNext(Boolean b) { if (b) { getMvpView().setFavouriteIcon(); - getMvpView().showErrorSnackBar("Add to Favourite "); } else { getMvpView().showErrorSnackBar("Something went wrong please try after" + "sometime"); @@ -151,7 +150,6 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView public void getFavourite(String id) { - if (mSubscriptions != null) mSubscriptions.unsubscribe(); mSubscriptions = mDataManager.getFavoriteWorkflow(id) .observeOn(AndroidSchedulers.mainThread())
