4.8.1.beta

.gitignore

@@ -5,5 +5,11 @@ aware-phone/release/*
 .DS_Store
 .DS_Store?
 local.properties
+
+# Built release APKs: these are build output, not source, and were being committed on every
+# rebuild (~6MB each x 5 ABI variants) — see resources/ below, which had 15 revisions across them
+# bloating .git well past what removing the current copies alone would show.
+*.apk
+
 *.jks
 *.keystore

CHANGES.txt

@@ -1,61 +1,96 @@
 Change log for AWARE
-4.7.3.beta
-- add column for record bluetooth connection status
+
+4.8.1.beta
+- Sensor and plugin consent is now shown before joining a study instead of after, and covers the plugins a study needs as well as its sensors, grouped into labelled sections
+- Leaving a study now always completes on the device, even when the research database cannot be reached; telling the researcher is best-effort, and the exit record states when it could not be delivered
+- New: when a researcher changes a study's database password, the app tells a rejected password apart from a database that is simply down, asks the participant to re-enter it, and pauses uploads until it is accepted
+- Fixed joining a study from a link or QR code, which crashed before any validation had run
+- A study that needs a participant-entered password can now be joined from a link or QR code; the app asks for the password instead of failing with nothing the participant can do
+- Join failures now say what is actually wrong: an invalid configuration, a missing password, a wrong password, or a database that cannot be reached. An unreachable database is no longer reported as a wrong password
+- Study addresses are checked before anything is downloaded, so a missing or malformed address gives a message instead of failing silently
+- When several study config checks are triggered at once, the app now runs one check instead of queuing every request
+- The app now stops waiting for a study configuration that does not answer in time, and refuses a configuration file larger than 5 MB
+- Sensors whose hardware the device does not have are now also ignored when a config update is applied, not only on first sync
+- Fixed a background timer that kept a processor core busy for hours for every pending ESM questionnaire
+- Fixed a pending ESM questionnaire preventing a study join from ever starting
+- The background collection notice is now always visible and silent, says that study data is being collected, and opens the app when tapped; added the notification permission that Android 13 and later require
+- Fixed screenshot capture restarting in a loop and creating a new capture session on every background service start
+- Fixed MQTT failing to start on an empty or malformed port, keep-alive, or quality-of-service setting
+- Fixed a worker thread being leaked on every restart of the background service
+- Fixed a scheduled action failing the whole scheduler when it pointed at something no longer installed or carried an unreadable value
+- Further Ambient Noise collection stability fixes
+- Fixed repeated permission requests looping in the background after a permission was denied
+- Security: database passwords are no longer written to the device log, including the database connection log
+- Security: password, secret, and token values are masked in logged study configuration and study data
+- Security: uploads are always encrypted, and a study that publishes its database's certificate authority in its configuration also gets the server's identity verified, so data reaches that study's server and no other host. A study that publishes no authority still gets an encrypted connection, but the server it connects to is not verified
+- Upload progress is tracked in its own table, so each table is uploaded once instead of being re-sent from the beginning whenever the log was cleared
+- Device information is now one row per device, rewritten when the device's hardware or Android version actually changes, and the server records a row per change
+- Device information drops four fields that carried no information: the serial (which Android stops reporting), the build type, the device label, and the brand (the manufacturer says the same thing)
+- Log entries now carry the kind of entry they are, so restarts, schedules, uploads, study changes and sensor diagnostics can be counted separately
+- Study rows now record when the configuration was last updated, name the join and re-join events explicitly, and carry the configuration only on the rows where it changed
+- Device information is no longer sent to awareframework.com when a device is first recorded
+- Fixed the on-device database never upgrading: a schema change was aborted part-way and silently rolled back, so several releases' worth of database changes had never reached a phone that already had AWARE installed. Upgrades now complete, keeping existing data, and a failed upgrade is recorded instead of being discarded
+- A study configuration is now applied even while the research database is unreachable. Only the upload waits for the database to come back; the participant is no longer told every minute that their study configuration is broken when nothing is wrong with it
+- A wrong database password and an unreachable database now give different messages when the study configuration is checked
+- Fixed a crash when the screen was rotated while a study was being joined
+- New: the participant is told when the study needs something from them — a study password, or consent for sensors a researcher has newly added — as a notification, so a paused study is noticed without opening the app. Notifications appear only for changes that need a decision: a frequency-only change is applied quietly
+- New: the main screen shows how far collected data has reached the research database, and each sensor shows the same alongside when it last recorded
+- New: the participant is told when data stops reaching the research database, and told once rather than repeatedly. Data continues to be collected and kept on the device until it can be sent. Researchers see when delivery started failing, why, and when it recovered
+- Fixed sensors reporting that they had never collected anything once their data had been uploaded and cleared from the device; the status and the researcher diagnostics now count delivered data as data the sensor collected
+- Fixed the magnetometer comparing one axis against the wrong two when deciding whether a reading changed enough to record, which made any magnetometer threshold keep and drop readings unpredictably
+- Sensor sensitivity settings (accelerometer, barometer, gravity, gyroscope, light, linear accelerometer, magnetometer, proximity, rotation, temperature) changed from raw numeric entry to descriptive presets stated in each sensor's own unit, with recommended values per sensor. A sensitivity larger than the sensor's readings ever change by is refused, and one already set that way now says the sensor is recording nothing instead of showing the number alone
+- Fixed a single sensor's delivery failure being hidden by the other sensors still delivering: whether data is reaching the research database is now tracked per sensor rather than as one flag for the whole upload. The main screen names the sensors that are not delivering, and a sensor that recovers no longer clears a warning that belongs to a different one. Researchers see each affected sensor's failure and its recovery separately
+- Fixed location collection stopping permanently the first time a study configuration was applied, and never resuming for as long as the app kept running, while the location sensor still reported itself as active. GPS, network and passive location are now re-registered when the sensor restarts
+- Fixed an upload waiting indefinitely when the research database accepts the connection and then stops answering. The wait is now bounded, so the stall is reported to the participant and the researcher instead of passing unnoticed for hours, and one stalled table no longer holds back every other table's upload. Collection is unaffected either way and data is kept on the device until it can be sent
+
+4.8.0.beta
+- Sensor sampling-rate settings (accelerometer, barometer, gravity, gyroscope, light, magnetometer, proximity, rotation, temperature, location, Wi-Fi/Bluetooth scanning, processor, Ambient Noise, OpenWeather) changed from raw numeric entry to descriptive dropdown presets, with more sensible default frequencies per sensor
+- New sensor diagnostic logging: when a sensor isn't collecting data, the reason (missing hardware, permission, or accessibility) is now recorded so researchers can see it in the synced data
+- Sensors without supported hardware are now excluded from study config sync instead of silently failing to apply
+- Fixed study config sync not always saving and applying updated settings correctly
+- Added missing consent requests for some sensors; consent checks are now consistent across all sensors
+- New per-sensor consent screen shown after joining a study
+- Fixed crash loops in the Ambient Noise and OpenWeather plugins
+- Wi-Fi scanning now correctly enforces the device's Location services toggle
+- Redesigned study info/history view with a shared study card; improved join/quit/rejoin tracking and sync
+- Fixed a crash when enabling or updating the accessibility service
+- Security: stopped exposing the API key in the UI and source
 
 4.7.2.beta
 - Fix ESM settings parsing crashes and improve error handling
 
 4.7.1.beta
 - New feature: Allow participants to add notes and save them to the remote database
-
-4.6.2.beta
 - Adjust function to count installation, change the official website url used for receive device info
-
-4.6.1.beta
 - New feature to new plugin: Ambient Noise and OpenWeather
 - Rename "AWARE-Light" to "AWARE"
-
-Change log for AWARE-Light
-4.6.1.beta
 - New feature: Allow users to take notes if config file container correspond setting.
-
-4.5.5.beta
 - Add function to count installation and send info to official website
-
-4.5.4.beta
 - Fix logic of reschedule next day random esm trigger, avoid repeat appear of esm notification
-
-4.5.3.beta
 - Fix the ESM queue logic to ensure that the correct number of questions are displayed according to the configurator settings.
-
-4.5.2.beta
 - Screenshot sensor can capture application name for foreground app.
-
-4.5.1.beta
 - New feature: Allow users to filter and save screenshots based on specific package names. Support for inclusive or exclusive.
-
-4.4.1.beta
 - New feature to synchronize the screenshot image data to the remote database specified by the aware-light configurator through base64 encoding.
-
-4.3.1.beta
 - New feature to capture screenshots at regular intervals and save them to the device's storage.
-
-4.2.2.beta
 - Fix display issues: long question titles can be displayed completely.
-
-4.2.1.beta
 - New feature to export the aware-light database files to the device's storage.
 
-4.1.6.beta
-- Fixed a crash that occurred when enabling accessibility before starting a study.
+Change log for AWARE-Light
+4.1.6.light.bundle
+- A crash that occurred when enabling accessibility before starting a study has been fixed.
 - The screen text sensor now correctly collects duplicate text when the foreground app changes, ensuring that screen text is captured during app switches, home screen access, and notification checks.
+- Fix display issues: long question titles can be displayed completely.
+- Fix the ESM queue logic to ensure that the correct number of questions are displayed according to the configurator settings.
+- Fix logic of reschedule next day random esm trigger, avoid repeat appear of esm notification.
+- A stronger password detection added in ScreenText Sensor
 
-4.1.5.beta
+4.1.5.light.bundle
 - Logging if the application is terminated by user actions or system actions to aware_log table
-
-4.1.4.beta
 - Screen reader function improved performance
 
+4.1.4.light.bundle
+- same as 4.1.3.light.bundle
+
 4.1.3.light.bundle
 - Fixed bug for random EMA triggered condition
 - Screen reader function improved performance

README.md

@@ -11,8 +11,8 @@ in naturalistic and laboratory settings. The platform can be integrated with MyS
 
 You can get the source code of all the components that make the AWARE client from GitHub.
 ```bash
-$ git clone https://github.com/awareframework/aware-light-client.git
-$ cd aware-light-client
+$ git clone https://github.com/awareframework/aware-client.git
+$ cd aware-client
 $ touch .gitmodules
 $ git submodule update --init
 ```

aware-core/aware.gradle

@@ -1,19 +1,18 @@
 //shared with all modules
 buildscript {
     ext {
+        // ion_libs, google_libs and aware_libs removed: unused (see build.gradle at repo root for
+        // the same cleanup). Note this file is currently not reached by any included module in
+        // settings.gradle — see the plugin build.gradle fix note below.
         mqtt_libs = '1.2.1'
-        ion_libs = "2.+"
-        google_libs = "17.0.0"
-        version_code = (System.getenv("VERSION_CODE") ?: "3").toInteger()
-        version_readable = System.getenv("VERSION_NAME") ?: ("4.7." + version_code + ".beta")
+        version_code = (System.getenv("VERSION_CODE") ?: "1").toInteger()
+        version_readable = System.getenv("VERSION_NAME") ?: ("4.8." + version_code + ".beta")
         compile_sdk = 28
         target_sdk = 28
         minimum_sdk = 24
         build_tools = "28.0.3"
-        aware_libs = "master-SNAPSHOT"
         kotlin_version = "1.3.41"
         build_gradle = "3.4.2"
-//        anko_version = "0.10.8"
     }
 
     repositories {

aware-core/build.gradle

@@ -81,7 +81,17 @@ dependencies {
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.squareup.okhttp3:okhttp:4.2.2"
-    implementation files('libs/mysql-connector-java-5.1.48.jar')
-    implementation files('libs/jsonassert-1.5.0.jar')
+    // Was vendored as libs/mysql-connector-java-5.1.48.jar (a binary committed to git with no
+    // update path). Same version, sourced from Maven Central instead so it's a normal tracked
+    // dependency. The 5.1.x line itself is EOL — moving to the current com.mysql:mysql-connector-j
+    // 8.x is a separate, larger change (driver class name and connection URL params changed
+    // between the lines) and needs a real device/DB test pass before swapping, tracked as its own
+    // follow-up rather than bundled into this dependency-hygiene fix.
+    implementation "mysql:mysql-connector-java:5.1.49"
+    // Was vendored as libs/jsonassert-1.5.0.jar — identical version, now from Maven Central.
+    // Group is org.skyscreamer there, not com.github.skyscreamer (that's a JitPack-style coordinate).
+    implementation "org.skyscreamer:jsonassert:1.5.0"
+
+    testImplementation 'junit:junit:4.13.2'
 }
 

aware-core/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /><!-- needed for Android 28 P -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!-- Support for Sync Adapters -->
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />
@@ -788,4 +789,4 @@
 
     </application>
 
-</manifest>
+</manifest>

aware-core/src/main/java/com/aware/Accelerometer.java

@@ -26,6 +26,7 @@
 import com.aware.providers.Accelerometer_Provider.Accelerometer_Data;
 import com.aware.providers.Accelerometer_Provider.Accelerometer_Sensor;
 import com.aware.utils.Aware_Sensor;
+import com.aware.utils.SensorTimeUnits;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -273,15 +274,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 saveAccelerometerDevice(mAccelerometer);
 
                 if (Aware.getSetting(this, Aware_Preferences.FREQUENCY_ACCELEROMETER).length() == 0) {
-                    Aware.setSetting(this, Aware_Preferences.FREQUENCY_ACCELEROMETER, 200000);
+                    Aware.setSetting(this, Aware_Preferences.FREQUENCY_ACCELEROMETER, 20000);
                 }
 
                 if (Aware.getSetting(this, Aware_Preferences.THRESHOLD_ACCELEROMETER).length() == 0) {
                     Aware.setSetting(this, Aware_Preferences.THRESHOLD_ACCELEROMETER, 0.0);
                 }
 
-                int new_frequency = Integer.parseInt(Aware.getSetting(getApplicationContext(), Aware_Preferences.FREQUENCY_ACCELEROMETER));
-                double new_threshold = Double.parseDouble(Aware.getSetting(getApplicationContext(), Aware_Preferences.THRESHOLD_ACCELEROMETER));
+                int new_frequency = Aware.getSettingAsInt(getApplicationContext(), Aware_Preferences.FREQUENCY_ACCELEROMETER, 20000);
+                double new_threshold = Aware.getSettingAsDouble(getApplicationContext(), Aware_Preferences.THRESHOLD_ACCELEROMETER, 0.0);
                 boolean new_enforce_frequency = (Aware.getSetting(getApplicationContext(), Aware_Preferences.FREQUENCY_ACCELEROMETER_ENFORCE).equals("true")
                         || Aware.getSetting(getApplicationContext(), Aware_Preferences.ENFORCE_FREQUENCY_ALL).equals("true"));
 
@@ -297,15 +298,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     ENFORCE_FREQUENCY = new_enforce_frequency;
                 }
 
-                mSensorManager.registerListener(this, mAccelerometer, Integer.parseInt(Aware.getSetting(getApplicationContext(), Aware_Preferences.FREQUENCY_ACCELEROMETER)), sensorHandler);
+                mSensorManager.registerListener(this, mAccelerometer, SensorTimeUnits.samplingPeriodUs(new_frequency), sensorHandler);
                 LAST_SAVE = System.currentTimeMillis();
 
                 if (Aware.DEBUG) Log.d(TAG, "Accelerometer service active: " + FREQUENCY + " ms");
 
                 if (Aware.isStudy(this)) {
                     ContentResolver.setIsSyncable(Aware.getAWAREAccount(this), Accelerometer_Provider.getAuthority(this), 1);
                     ContentResolver.setSyncAutomatically(Aware.getAWAREAccount(this), Accelerometer_Provider.getAuthority(this), true);
-                    long frequency = Long.parseLong(Aware.getSetting(this, Aware_Preferences.FREQUENCY_WEBSERVICE)) * 60;
+                    long frequency = Aware.getSettingAsLong(this, Aware_Preferences.FREQUENCY_WEBSERVICE, 30) * 60;
                     SyncRequest request = new SyncRequest.Builder()
                             .syncPeriodic(frequency, frequency/3)
                             .setSyncAdapter(Aware.getAWAREAccount(this), Accelerometer_Provider.getAuthority(this))