Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile
diff --git a/app/build.gradle b/app/build.gradle
index 1e09ba2..145d2af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,10 @@
android {
compileSdkVersion rootProject.ext.compileSdkVersion
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
useLibrary 'org.apache.http.legacy'
lintOptions {
abortOnError false
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ed6b3c..75ea3a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,8 @@
android:icon="@mipmap/ic_launcher"
android:largeHeap="true"
android:label="@string/app_name"
- android:theme="@style/Theme.Taverna">
+ android:theme="@style/Theme.Taverna"
+ android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".ui.login.LoginActivity"
android:label="@string/app_name">
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
index 320fb65..bc68952 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
@@ -26,6 +26,7 @@
import org.apache.taverna.mobile.ui.base.BaseActivity;
import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.Constants;
import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
import android.content.Intent;
@@ -190,8 +191,8 @@
@Override
public void onItemClick(View childView, int position) {
Intent intent = new Intent(getActivity(), WorkflowDetailActivity.class);
- intent.putExtra("id", mWorkflowList.get(position).getId());
- intent.putExtra("title", mWorkflowList.get(position).getTitle());
+ intent.putExtra(Constants.WORKFLOW_ID, mWorkflowList.get(position).getId());
+ intent.putExtra(Constants.WORKFLOW_TITLE, mWorkflowList.get(position).getTitle());
startActivity(intent);
}
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..b4cde2a
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config cleartextTrafficPermitted="true">
+ <domain includeSubdomains="true">www.myexperiment.org</domain>
+ </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fe01cf4..88a05b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1"
classpath 'de.hdodenhof:circleimageview:2.2.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36cf0ce..368f5a9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 01 11:40:02 GMT 2018
+#Tue Mar 26 11:22:36 GMT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
