Merge branch 'master' into PlayerIntegration # Conflicts: # app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java # app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
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/2bef77c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2bef77c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2bef77c5 Branch: refs/heads/master Commit: 2bef77c51431e98efbd7f7e3bbaa91ab61652a68 Parents: c247d77 f4b64b1 Author: Sagar <[email protected]> Authored: Mon Sep 26 15:47:58 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Sep 26 15:47:58 2016 +0530 ---------------------------------------------------------------------- .../WorkflowdetailFragmentTest.java | 25 + .../activities/DashboardMainActivity.java | 14 + .../apache/taverna/mobile/data/DataManager.java | 4 + .../apache/taverna/mobile/data/model/User.java | 30 +- .../taverna/mobile/data/model/Workflow.java | 10 +- .../taverna/mobile/data/remote/APIEndPoint.java | 5 +- .../mobile/data/remote/TavernaService.java | 6 + .../mobile/fragments/WorkflowViewpager.java | 25 + .../fragments/workflowdetails/RunFragment.java | 25 + .../taverna/mobile/tavernamobile/Runs.java | 25 + .../ui/adapter/FavouriteWorkflowsAdapter.java | 25 + .../mobile/ui/adapter/WorkflowAdapter.java | 25 + .../ui/myworkflows/MyWorkflowFragment.java | 203 + .../ui/myworkflows/MyWorkflowMvpView.java | 34 + .../ui/myworkflows/MyWorkflowPresenter.java | 126 + .../workflowdetail/WorkflowDetailPresenter.java | 7 + .../apache/taverna/mobile/utils/RunTask.java | 25 + .../mobile/utils/WorkflowDataCallback.java | 25 + .../taverna/mobile/utils/WorkflowOpen.java | 25 + .../mobile/utils/xmlparsers/WorkflowParser.java | 25 + app/src/main/res/anim/zoomin.xml | 24 + app/src/main/res/anim/zoomout.xml | 24 + app/src/main/res/drawable/round_shape.xml | 24 + app/src/main/res/layout/activity_run_result.xml | 24 + app/src/main/res/layout/fragment_dashboard.xml | 9 + app/src/main/res/layout/fragment_run_result.xml | 25 +- app/src/main/res/layout/usage_layout.xml | 24 + app/src/main/res/menu/drawer_view.xml | 7 +- app/src/main/res/menu/run_result.xml | 24 + app/src/main/res/values/strings.xml | 2 + .../res/values/strings_activity_settings.xml | 24 + app/src/main/res/xml/pref_general.xml | 24 + app/src/main/res/xml/pref_headers.xml | 24 + build.gradle | 8 +- projectFilesBackup/.idea/workspace.xml | 3587 ++++++++++++++++++ 35 files changed, 4524 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java ---------------------------------------------------------------------- diff --cc app/src/main/java/org/apache/taverna/mobile/data/DataManager.java index 5444976,534b903..5171763 --- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java @@@ -169,44 -166,8 +170,47 @@@ public class DataManager }); } + /** + * @param url is Workflow's content xml URL + * @return OkHTTP ResponseBody of download file + */ + public Observable<ResponseBody> downloadWorkflowContent(String url) { + return mBaseApiManager.getTavernaApi().downloadWorkflowContent(url); + } + + /** + * @param body is body of upload workflow's detail + * @param baseAuth is base64 encoded credential + * @return Workflow's ID + */ + public Observable<PlayerWorkflow> uploadWorkflowContent(RequestBody body, String baseAuth) { + return mBaseApiManager.getTavernaPlayerApi().uploadWorkflow(body, baseAuth); + } + + /** + * @param credentials is base64 encoded credential + * @param flagLogin is used to maintain the Remain login or not + * @return okHTTP ResponseBody + */ + + public Observable<ResponseBody> authPlayerUserLoginDetail(final String credentials, + final boolean flagLogin) { + return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials) + .concatMap(new Func1<ResponseBody, Observable<? extends ResponseBody>>() { + @Override + public Observable<? extends ResponseBody> call(ResponseBody responseBody) { + + return Observable.just(responseBody); + } + }); + + } + + public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id) { + return mBaseApiManager.getTavernaPlayerApi().getWorkflowDetail(id); + } + public Observable<User> getMyWorkflows(String userID, Map<String, String> options) { + return mBaseApiManager.getTavernaApi().getUserDetail(userID , options); + } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java ---------------------------------------------------------------------- diff --cc app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java index cf0511b,86a859b..b57436a --- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java @@@ -28,11 -28,6 +28,14 @@@ public class APIEndPoint public static final String WORKFLOW = "workflow.xml"; public static final String USER = "user.xml"; public static final String LICENSE = "license.xml"; - public static final String WHOAMI = "whoami.xml"; + ++ + public static final String XML_ACCEPT_HEADER = "Accept: application/xml"; + public static final String JSON_ACCEPT_HEADER = "Accept: application/json"; + public static final String JSON_CONTENT_HEADER = "Content-Type: application/json"; + public static final String UTF_CONTENT_ENCODING_HEADER = "Content-Encoding: UTF-8"; ++ + public static final String MY_WORKFLOWS = "user.xml"; ++ } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java ---------------------------------------------------------------------- diff --cc app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java index 943f1dc,8d609c6..c1aed26 --- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java @@@ -63,8 -60,7 +63,14 @@@ public interface TavernaService @GET(APIEndPoint.WHOAMI) Observable<User> getLoginUserDetail(@Header("Authorization") String credentials); ++ + @GET + @Headers(APIEndPoint.XML_ACCEPT_HEADER) + Observable<ResponseBody> downloadWorkflowContent(@Url String workflowContentUrl); + ++ + @GET(APIEndPoint.MY_WORKFLOWS) + Observable<Workflows> getMyWorkflows(@Query("id") String id, + @QueryMap Map<String, String> options); ++ } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/res/layout/fragment_run_result.xml ---------------------------------------------------------------------- diff --cc app/src/main/res/layout/fragment_run_result.xml index 78b3a0d,20728d7..676c307 --- a/app/src/main/res/layout/fragment_run_result.xml +++ b/app/src/main/res/layout/fragment_run_result.xml @@@ -4,7 -28,7 +28,6 @@@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" -- tools:context="org.apache.taverna.mobile.activities.RunResult$PlaceholderFragment" android:orientation="vertical" > http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/build.gradle ---------------------------------------------------------------------- diff --cc build.gradle index fda2b59,7df1c68..a67b30d --- a/build.gradle +++ b/build.gradle @@@ -4,11 -4,12 +4,12 @@@ buildscript repositories { jcenter() mavenCentral() + maven { url "https://plugins.gradle.org/m2/"; } } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - + classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }
