Merge pull request #55 from awareframework/bridge-merge

Merge Beta function to main

Author: tinazhang128

.DS_Store

@@ -0,0 +1 @@
+resources/*.apk filter=lfs diff=lfs merge=lfs -text

.gitattributes

@@ -0,0 +1,7 @@
+build/
+/.gradle
+/.idea
+aware-phone/release/*
+.DS_Store
+.DS_Store?
+local.properties

.gitignore

@@ -1,36 +0,0 @@
-[submodule "com.aware.plugin.ambient_noise"]
-	path = com.aware.plugin.ambient_noise
-	url = https://github.com/denzilferreira/com.aware.plugin.ambient_noise.git
-[submodule "com.aware.plugin.contacts_list"]
-	path = com.aware.plugin.contacts_list
-	url = https://github.com/denzilferreira/com.aware.plugin.contacts_list.git
-[submodule "com.aware.plugin.device_usage"]
-	path = com.aware.plugin.device_usage
-	url = https://github.com/denzilferreira/com.aware.plugin.device_usage.git
-[submodule "com.aware.plugin.esm.scheduler"]
-	path = com.aware.plugin.esm.scheduler
-	url = https://github.com/denzilferreira/com.aware.plugin.esm.scheduler.git
-[submodule "com.aware.plugin.fitbit"]
-	path = com.aware.plugin.fitbit
-	url = https://github.com/denzilferreira/com.aware.plugin.fitbit.git
-[submodule "com.aware.plugin.google.activity_recognition"]
-	path = com.aware.plugin.google.activity_recognition
-	url = https://github.com/denzilferreira/com.aware.plugin.google.activity_recognition.git
-[submodule "com.aware.plugin.google.auth"]
-	path = com.aware.plugin.google.auth
-	url = https://github.com/denzilferreira/com.aware.plugin.google.auth.git
-[submodule "com.aware.plugin.google.fused_location"]
-	path = com.aware.plugin.google.fused_location
-	url = https://github.com/denzilferreira/com.aware.plugin.google.fused_location.git
-[submodule "com.aware.plugin.openweather"]
-	path = com.aware.plugin.openweather
-	url = https://github.com/denzilferreira/com.aware.plugin.openweather.git
-[submodule "com.aware.plugin.sensortag"]
-	path = com.aware.plugin.sensortag
-	url = https://github.com/denzilferreira/com.aware.plugin.sensortag.git
-[submodule "com.aware.plugin.sentimental"]
-	path = com.aware.plugin.sentimental
-	url = https://github.com/denzilferreira/com.aware.plugin.sentimental.git
-[submodule "com.aware.plugin.studentlife.audio_final"]
-	path = com.aware.plugin.studentlife.audio_final
-	url = https://github.com/denzilferreira/com.aware.plugin.studentlife.audio_final.git

.gitmodules

@@ -1,3 +1,20 @@
+Change log for AWARE
+4.2.1.light.bundle
+- New feature: Allow participants to add notes and save them to the remote database
+- Adjust function to count installation, change the official website url used for receive device info
+- New feature to new plugin: Ambient Noise and OpenWeather
+- Rename "AWARE-Light" to "AWARE"
+- New feature: Allow users to take notes if config file container correspond setting.
+- Add function to count installation and send info to official website
+- Fix logic of reschedule next day random esm trigger, avoid repeat appear of esm notification
+- Fix the ESM queue logic to ensure that the correct number of questions are displayed according to the configurator settings.
+- Screenshot sensor can capture application name for foreground app.
+- New feature: Allow users to filter and save screenshots based on specific package names. Support for inclusive or exclusive.
+- New feature to synchronize the screenshot image data to the remote database specified by the aware-light configurator through base64 encoding.
+- New feature to capture screenshots at regular intervals and save them to the device's storage.
+- Fix display issues: long question titles can be displayed completely.
+- New feature to export the aware-light database files to the device's storage.
+
 Change log for AWARE-Light
 4.1.6.light.bundle
 - A crash that occurred when enabling accessibility before starting a study has been fixed.
@@ -9,14 +26,14 @@ Change log for AWARE-Light
 
 4.1.5.light.bundle
 - Logging if the application is terminated by user actions or system actions to aware_log table
-- Screen reader function improved preformance
+- 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 preformance
+- Screen reader function improved performance
 
 4.1.2.light.bundle
 - Screen reader table allows longer text to be stored
@@ -31,4 +48,4 @@ Change log for AWARE-Light
 - Fixed bug that caused AWARE-Light to crash when phone call or SMS functions were used.
 
 4.0.820.light.bundle
-- This version started by forking AWARE (https://github.com/denzilferreira/aware-client) and making various changes to get AWARE-Light.
+- This version started by forking AWARE (https://github.com/denzilferreira/aware-client) and making various changes to get AWARE-Light.

CHANGES.txt

@@ -1,24 +1,24 @@
-AWARE-Light Framework for Android Client
+AWARE Framework for Android Client
 ======================
 
-AWARE-Light is an Android framework dedicated to instrument, infer, log and share mobile context information,
-for application developers, researchers and smartphone users. AWARE-Light captures hardware-, software-, and 
+AWARE is an Android framework dedicated to instrument, infer, log and share mobile context information,
+for application developers, researchers and smartphone users. AWARE captures hardware-, software-, and 
 human-based data. It encapsulates analysis, machine learning and simplifies conducting user studies 
 in naturalistic and laboratory settings. The platform can be integrated with MySQL database.
 
 
 # Getting Started
 
-You can get the source code of all the components that make the AWARE-Light client from GitHub.
+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
 ```
 
 # Contributing
-If you would like to contribute to AWARE-Light, please contact Dr [Simon D'Alfonso](https://findanexpert.unimelb.edu.au/profile/180658-simon-d'alfonso)  or Dr [Vassilis Kostakos](https://people.eng.unimelb.edu.au/vkostakos/).
+If you would like to contribute to AWARE, please contact Dr [Simon D'Alfonso](https://findanexpert.unimelb.edu.au/profile/180658-simon-d'alfonso)  or Dr [Vassilis Kostakos](https://people.eng.unimelb.edu.au/vkostakos/).
 
 
 # App features
@@ -56,15 +56,15 @@ Please make sure the Android SDK is pointing the correct directory and is select
 
 # Frequent Issues
 
-## AWARE-Light flicking after installation
+## AWARE flicking after installation
 Please make sure:
-1) all the permissions are granted to AWARE-Light
-2) location and bluetooth are turned on before installing AWARE-Light
+1) all the permissions are granted to AWARE
+2) location and bluetooth are turned on before installing AWARE
 
-## Error message that AWARE-Light incompatible with the phone
+## Error message that AWARE incompatible with the phone
 For phones with Android 13+, please generate APK file with 'arm64-v8a'.
 
-## AWARE-Light not collecting data
+## AWARE not collecting data
 * The main idea is to keep the application run in the background and prevent system setting from killing it. Battery optimization and locking it in the system menu is needed.
 Here are some general steps, but please note that the specific steps may vary depending on your phone model:
 - Go to Setting -> Battery -> Scenario AI-optimization -> Sleep mode needs to be off
@@ -73,7 +73,7 @@ Here are some general steps, but please note that the specific steps may vary de
 - Go to Setting -> Battery -> More Settings -> Power-saver settings -> Turn on automatically needs to be off
 - Go to Setting -> Battery -> More Settings -> Power-saver settings -> Restrict apps from accessing network needs to be off
 
-* Accessibility needs to be turned on for AWARE-Light for special sensors to work: Applications, Touch, Notifications, Keyboard, Crash logs, Screen reader
+* Accessibility needs to be turned on for AWARE for special sensors to work: Applications, Touch, Notifications, Keyboard, Crash logs, Screen reader
 
 * Accessibility cannot be turned on (a helpful [demonstration video](https://www.youtube.com/watch?v=0bcLjpfrmHw)):
 1) On your Android device, open the Settings app.

README.md

@@ -4,16 +4,15 @@ buildscript {
         mqtt_libs = '1.2.1'
         ion_libs = "2.+"
         google_libs = "17.0.0"
-        version_code = 6
-        version_readable = "4.1." + version_code + "." + "light.bundle"
+        version_code = 1
+        version_readable = "4.2." + version_code + "." + "light.bundle"
         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/aware.gradle

@@ -42,6 +42,8 @@ android {
         resValue "string", "provider_timezones", "com.aware.provider.timezone"
         resValue "string", "provider_traffic", "com.aware.provider.traffic"
         resValue "string", "provider_wifi", "com.aware.provider.wifi"
+        resValue "string", "provider_screenshot", "com.aware.provider.screenshot"
+        resValue "string", "provider_notes", "com.aware.provider.notes"
     }
 
     signingConfigs {
@@ -70,7 +72,6 @@ dependencies {
     implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$mqtt_libs"
     implementation 'com.koushikdutta.ion:ion:2.2.1'
     implementation 'com.google.android.material:material:1.1.0-alpha09'
-    implementation "org.jetbrains.anko:anko:$anko_version"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.annotation:annotation:1.1.0'

aware-core/build.gradle

@@ -23,6 +23,13 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+    <queries>
+        <package android:name="com.aware.providers" />
+        <package android:name="com.aware.ui" />
+        <package android:name="com.aware.utils" />
+        <package android:name="com.aware.syncadapters" />
+    </queries>
+
     <application
         android:networkSecurityConfig="@xml/aware_ssl_config">
 
@@ -174,6 +181,15 @@
         <service
             android:name="com.aware.SignificantMotion"
             android:exported="true" />
+        <service
+            android:name="com.aware.ScreenShot"
+            android:exported="true"
+            android:permission="android.permission.FOREGROUND_SERVICE" />
+        <service
+            android:name="com.aware.Notes"
+            android:exported="true" />
+
+
 
         <receiver
             android:name="com.aware.Aware$Storage_Broadcaster"
@@ -422,6 +438,16 @@
             android:readPermission="com.aware.READ_CONTEXT_DATA"
             android:syncable="true"
             android:writePermission="com.aware.WRITE_CONTEXT_DATA" />
+
+        <provider
+            android:name=".providers.ScreenShot_Provider"
+            android:authorities="${applicationId}.provider.screenshot"
+            android:exported="true"
+            android:label="@string/sensor_screenshot"
+            android:readPermission="com.aware.READ_CONTEXT_DATA"
+            android:syncable="true"
+            android:writePermission="com.aware.WRITE_CONTEXT_DATA" />
+
         <provider
             android:name="com.aware.providers.Significant_Provider"
             android:authorities="${applicationId}.provider.significant"
@@ -431,6 +457,15 @@
             android:syncable="true"
             android:writePermission="com.aware.WRITE_CONTEXT_DATA" />
 
+        <provider
+            android:name="com.aware.providers.Notes_Provider"
+            android:authorities="${applicationId}.provider.notes"
+            android:exported="true"
+            android:label="@string/sensor_notes"
+            android:readPermission="com.aware.READ_CONTEXT_DATA"
+            android:syncable="true"
+            android:writePermission="com.aware.WRITE_CONTEXT_DATA"/>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider.storage"
@@ -441,6 +476,8 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+
+
         <!-- Core Sync-Adapters -->
 
         <service
@@ -724,6 +761,29 @@
                 android:resource="@xml/sync_wifi" />
         </service>
 
+        <service
+            android:name="com.aware.syncadapters.ScreenShot_Sync"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_screenshot" />
+        </service>
+
+        <service
+            android:name="com.aware.syncadapters.Notes_Sync"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_notes" />
+        </service>
+
+
     </application>
 
 </manifest>

aware-core/src/main/AndroidManifest.xml

@@ -105,6 +105,11 @@ public class Applications extends AccessibilityService {
 
     private String previousForegroundApp = "";
 
+    private static String foregroundPackageName = "";
+
+    private static String foregroundApplicationName = "";
+
+
     private static List<Integer> sensitiveInputType = Arrays.asList(129, 225, 145);
 //    int mDebugDepth = 0;
 
@@ -158,7 +163,9 @@ private void textTree(AccessibilityNodeInfo mNodeInfo){
      * @param package_name
      * @return appName
      */
-    private String getApplicationName(String package_name) {
+    public String getApplicationName(String package_name) {
+
+        Log.d("Screenshot", "package_name: " + package_name);
         PackageManager packageManager = getPackageManager();
         ApplicationInfo appInfo;
         try {
@@ -170,6 +177,8 @@ private String getApplicationName(String package_name) {
         if (appInfo != null && packageManager.getApplicationLabel(appInfo) != null) {
             appName = (String) packageManager.getApplicationLabel(appInfo);
         }
+
+        Log.d("Screenshot", "appName: " + appName);
         return appName;
     }
 
@@ -182,9 +191,12 @@ private String getApplicationName(String package_name) {
     public void onAccessibilityEvent(AccessibilityEvent event) {
         if (event.getPackageName() == null) return;
 
-        // if content buffer is full then send all contents in the content buffer
+        if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+            foregroundPackageName = event.getPackageName().toString();
+            foregroundApplicationName = getApplicationName(foregroundPackageName);
+        }
+
         if (contentBuffer.size() == TEXT_BUFFER_LIMIT){
-            // Log.d("Screen_Text", "==========LIMIT REACH============");
 
             for (ContentValues content: contentBuffer){
                 getContentResolver().insert(ScreenText_Provider.ScreenTextData.CONTENT_URI, content);
@@ -195,8 +207,6 @@ public void onAccessibilityEvent(AccessibilityEvent event) {
             }
             textBuffer.clear();
             contentBuffer.clear();
-
-            // Log.d("Screen_Text", "==========CLEAN BUFFER============");
         }
 
 
@@ -265,15 +275,8 @@ else if (criteria == 1 && app_names.contains(curr_app)) { // package in exclusiv
 
                 // Check if the foreground app has changed
                 if (!currentForegroundApp.equals(previousForegroundApp)) {
-//                    // Log.d("Screen_Text", "==========App Switch============");
-                    if (!textBuffer.contains(hashedText)) {
-                        textBuffer.add(hashedText);
-                        contentBuffer.add(screenText);
-//                       // Log.d("Screen_Text", "Add ContentText: " + currScreenText);
-                    }
-
 
-                    // Log.d("Screen_Text", "Current ContentBuffer Size: " + contentBuffer.size());
+//                    // Log.d("Screen_Text", "==========App Switch============");
 
                     for (ContentValues content: contentBuffer){
                         getContentResolver().insert(ScreenText_Provider.ScreenTextData.CONTENT_URI, content);
@@ -289,6 +292,12 @@ else if (criteria == 1 && app_names.contains(curr_app)) { // package in exclusiv
                     // Update the previous foreground app
                     previousForegroundApp = currentForegroundApp;
 
+                    if (!textBuffer.contains(hashedText)) {
+                        textBuffer.add(hashedText);
+                        contentBuffer.add(screenText);
+//                       // Log.d("Screen_Text", "Add ContentText: " + currScreenText);
+                    }
+
                 } else {
                     // Add to content: get rid of the duplicate text
                     if (!textBuffer.contains(hashedText)) {
@@ -1022,4 +1031,12 @@ private boolean exists(List<RunningAppProcessInfo> running, Cursor dbApp) {
     public static boolean isSystemPackage(PackageInfo pkgInfo) {
         return pkgInfo != null && ((pkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1);
     }
+
+    public static String getForegroundPackageName() {
+        return foregroundPackageName;
+    }
+
+    public static String getForegroundApplicationName() {
+        return foregroundApplicationName;
+    }
 }