diff --git a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java index 091a29ac1..36cb912c1 100755 --- a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java +++ b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java @@ -614,6 +614,12 @@ protected void onResume() { Cursor qry = Aware.getStudy(this, study_url); if (qry != null && qry.moveToFirst()) { + + /* + --NOTE-- + Denzil: as plugins are bundled with the client, we no longer need this. Also allows people to join study whether or not a plugin exists for Android and iOS + -------- + if (active_plugins.size() == 0) { pluginsInstalled = true; llPluginsRequired.setVisibility(View.GONE); @@ -621,6 +627,11 @@ protected void onResume() { pluginsInstalled = verifyInstalledPlugins(); llPluginsRequired.setVisibility(View.VISIBLE); } + */ + + pluginsInstalled = true; + llPluginsRequired.setVisibility(View.GONE); + if (pluginsInstalled) { btnAction.setAlpha(1f); btnAction.setEnabled(true); diff --git a/build.gradle b/build.gradle index 87505df9a..fe23feaa0 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { build_tools = "28.0.3" aware_libs = "master-SNAPSHOT" kotlin_version = "1.3.41" - build_gradle = '3.5.0' + build_gradle = '3.5.1' anko_version = "0.10.8" } diff --git a/com.aware.plugin.fitbit b/com.aware.plugin.fitbit index 13993303a..c37d31f88 160000 --- a/com.aware.plugin.fitbit +++ b/com.aware.plugin.fitbit @@ -1 +1 @@ -Subproject commit 13993303aa2a2b00acf058a88299e2d2eb5d2166 +Subproject commit c37d31f88f1f5c2ea32ade3525bd4486ce4068c5 diff --git a/com.aware.plugin.google.auth b/com.aware.plugin.google.auth index d7590cc05..c73170df2 160000 --- a/com.aware.plugin.google.auth +++ b/com.aware.plugin.google.auth @@ -1 +1 @@ -Subproject commit d7590cc05778146ae34586e9b95c414fabb13cd5 +Subproject commit c73170df2c90197b733d79a396561476a700d058