- Since bundled client, no need to check if plugin is installed or no…

…t. Also allows Android & iOS studies, regardless of plugin availability.
denzilferreira · Oct 7, 2019 · 1b71684 · 1b71684
1 parent d683ff1
commit 1b71684
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
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
@@ -614,13 +614,24 @@ 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);
             } else {
                 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
@@ -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
diff --git a/com.aware.plugin.google.auth b/com.aware.plugin.google.auth