You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2018/02/20 05:11:16 UTC
[4/6] incubator-taverna-mobile git commit: Migration RxJava1 ->
RxJava2 (Updated)
Migration RxJava1 -> RxJava2 (Updated)
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/1e8f57b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1e8f57b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1e8f57b8
Branch: refs/heads/master
Commit: 1e8f57b8b9ec85995fdced7a538143665dbd66a1
Parents: 9ae9186
Author: Hitesh Gautam <ga...@gmail.com>
Authored: Tue Feb 20 03:20:48 2018 +0530
Committer: Hitesh Gautam <ga...@gmail.com>
Committed: Tue Feb 20 03:20:48 2018 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/local/PreferencesHelper.java | 6 ------
.../ui/favouriteworkflow/FavouriteWorkflowsPresenter.java | 4 ++--
.../FavouriteWorkflowDetailPresenter.java | 6 ++----
.../org/apache/taverna/mobile/ui/login/LoginPresenter.java | 7 +++----
.../taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java | 1 -
.../apache/taverna/mobile/ui/workflow/WorkflowPresenter.java | 1 -
.../taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java | 2 +-
build.gradle | 2 ++
8 files changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 6593e0b..ee702ae 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -159,12 +159,6 @@ public class PreferencesHelper {
public Observable<User> saveUserDetail(final User user) {
return Observable.defer(new Callable<ObservableSource<? extends User>>() {
- /**
- * Computes a result, or throws an exception if unable to do so.
- *
- * @return computed result
- * @throws Exception if unable to compute a result
- */
@Override
public ObservableSource<? extends User> call() throws Exception {
if (user.getElementId() != null) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
index 886d84b..f0ab7bf 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -94,8 +94,8 @@ public class FavouriteWorkflowsPresenter extends BasePresenter<FavouriteWorkflow
.observeOn(AndroidSchedulers.mainThread())
.subscribeWith(new DisposableObserver<String>() {
@Override
- public void onNext(String s) {
- getMvpView().performSearch(s);
+ public void onNext(String searchQuery) {
+ getMvpView().performSearch(searchQuery);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/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 ca747e9..fe03548 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
@@ -38,10 +38,8 @@ public class FavouriteWorkflowDetailPresenter extends
public final String LOG_TAG = getClass().getSimpleName();
private DataManager mDataManager;
-
private CompositeDisposable compositeDisposable;
-
public FavouriteWorkflowDetailPresenter(DataManager dataManager) {
mDataManager = dataManager;
compositeDisposable = new CompositeDisposable();
@@ -143,8 +141,8 @@ public class FavouriteWorkflowDetailPresenter extends
.subscribeOn(Schedulers.io())
.subscribeWith(new DisposableObserver<Boolean>() {
@Override
- public void onNext(Boolean b) {
- if (b) {
+ public void onNext(Boolean favoriteStatus) {
+ if (favoriteStatus) {
getMvpView().setFavouriteIcon();
} else {
getMvpView().showErrorSnackBar("Something went wrong please try after" +
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
index ad47cc0..4b85914 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
@@ -36,7 +36,6 @@ public class LoginPresenter extends BasePresenter<LoginMvpView> {
public final String LOG_TAG = getClass().getSimpleName();
private DataManager mDataManager;
-
private CompositeDisposable compositeDisposable;
public LoginPresenter(DataManager dataManager) {
@@ -65,7 +64,8 @@ public class LoginPresenter extends BasePresenter<LoginMvpView> {
.subscribeWith(new DisposableObserver<User>() {
@Override
public void onNext(User value) {
-
+ getMvpView().showDashboardActivity();
+ getMvpView().showProgressDialog(false);
}
@Override
@@ -76,8 +76,7 @@ public class LoginPresenter extends BasePresenter<LoginMvpView> {
@Override
public void onComplete() {
- getMvpView().showDashboardActivity();
- getMvpView().showProgressDialog(false);
+
}
}));
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index fbc00e4..b8a4d65 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -37,7 +37,6 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
private static final String TAG = PlayerLoginPresenter.class.getSimpleName();
private DataManager mDataManager;
-
private CompositeDisposable compositeDisposable;
public PlayerLoginPresenter(DataManager dataManager) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowPresenter.java
index fd5bdcd..f73c83f 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowPresenter.java
@@ -115,7 +115,6 @@ public class WorkflowPresenter extends BasePresenter<WorkflowMvpView> {
}
}));
- compositeDisposable.add(compositeDisposable);
}
public void detachSearchHandler() {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
index cc56c40..a7ffcb8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -66,7 +66,7 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
}
public void runWorkflow(String contentURL) {
- compositeDisposable.clear();
+ checkViewAttached();
compositeDisposable.add(mDataManager.downloadWorkflowContent(contentURL)
.concatMap(new Function<ResponseBody, ObservableSource<PlayerWorkflow>>() {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e8f57b8/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e0c1c0a..832c021 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,8 @@ ext {
buildToolsVersion = '27.0.3'
// App dependencies
+ rxJavaVersion = '2.0.1'
+ rxAndroidVersion = '2.0.1'
supportLibraryVersion = '27.0.2'
raizLabsDBFlow = '3.1.1'
retrofitVersionLatest = '2.3.0'