Bluetooth Beacon Detection functionality added

PHP_upload_script.txt

@@ -1,40 +1,22 @@
 <?php
-foreach ($_FILES["fileToUpload"]["error"] as $key => $error) {
-    if ($error == UPLOAD_ERR_OK) {
-        $tmp_name = $_FILES["fileToUpload"]["tmp_name"][$key];
-        $name = $_FILES["fileToUpload"]["name"][$key];
-        $file_path = "./uploads/";
-        $file_path = $file_path . $name;
-            if(move_uploaded_file($tmp_name, $file_path)) 
-            {
-               echo "OK:".$name."\r\n";
+$target_dir = "../uploads/";
+foreach ($_FILES as $file) {
+  if ($file['type'] !== 'text/plain' && $file['type'] !== 'video/3gp') {
+    continue; // ignore non text or 3gp files
+  }
 
-            } else{
-               echo "ERR:".$name."\r\n";
-            }   
-    }
+  $name = $file['name'];
+  $error = $file['error'];
 
-}
-?>
+  if ($error !== UPLOAD_ERR_OK) {
+    echo "ERR:${error}:${name}\r\n";
+    continue;
+  }
 
-<?php
-$target_dir = "../uploads/";
-foreach ($_FILES["fileToUpload"]["error"] as $key => $error) {
-    $name = $_FILES["fileToUpload"]["name"][$key];
-    if ($error == UPLOAD_ERR_OK) {
-        $tmp_name = $_FILES["fileToUpload"]["tmp_name"][$key];        
-        $target_file = $target_dir . $name;
-        if(move_uploaded_file($tmp_name, $target_file))
-        {
-           echo "OK:".$error.":".$name."\r\n";
-        } else{
-           echo "ERR:UPLOAD_ERR_MOVE:".$name."\r\n";
-        } 
-    } else {
-        echo "ERR:".$error.":".$name."\r\n";
-    }
+  if (move_uploaded_file($file['tmp_name'], $target_dir . $name)) {
+    echo "OK:${error}:${name}\r\n";
+  } else {
+     echo "ERR:UPLOAD_ERR_MOVE:${name}\r\n";
+  }
 }
 ?>
-
-
-

README.md

@@ -10,13 +10,14 @@ Application features:
   - Environmental sensors data as temperature, light, pressure and humidity;
   - Positioning sensors data such as location and satellites;
   - Networks connectivity data, as network cells and WiFi networks;
+  - Available Bluetooth beacons
   - Battery level
   - Microphone audio
   - Google activity recognition labels
 - Every sensors can be configured in the settings to enable/disable it, set the sampling frequency, the remote upload of its data.
 - Remote upload of data (`PHP_upload_script.txt` contains the PHP code for the server)
 - Multidevice (master-slaves) configuration
-- Bluetooth connection for synchronization among device of time and status (logging/no logging, labels, sublabels)
+- Bluetooth connection for synchronization among devices of time and status (logging/no logging, labels, sublabels)
 - Autostart at boot/reboot
 - Background logging using persistent notification
 - Logging of data on files (a new file is created at regular interval to reduce data loss)
@@ -51,6 +52,27 @@ The remote upload functionality requires to set up the remote address for the up
 Due to the changes to the permissions systems in the latest versions of Android, please check and authorize the access to Microphone, 
 Storage, Telephone and Location in the system settings before to use the application.
 
+## User guide
+### Getting started
+- Install the app on a smartphone via apk
+- Make sure ALL permissions are enabled in the system settings for this app
+- Enable Bluetooth, Wifi, Mobile Data and Location sensors of the phone
+
+###  Configuration
+- Start the app
+- Open the settings by entering the setting's password
+- Set the user name, device location (master or slave), maximum log file size and logging time intervals in "General"
+- Set the server address for the file upload in "Synchronisation"
+- Make sure all sensors are enabled
+- Set the sampling rates for the sensors if needed
+
+### Collecting data
+- Connect all slaves to the master if needed
+- Start the data collection by pressing the "OFF" button
+- Data gets now collected until stopping it by pressing "ON"
+- Logs can be labeled for more meta information
+- To upload all log files to the server make sure the phone is connected to a Wifi network and press "Upload"
+
 ## LICENSE
 This application has been developed for research purpose and release under MIT License. The usage of this application in research and publications must be acknowledged by citing the following publication:
 

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "uk.ac.sussex.wear.android.datalogger"

app/src/main/AndroidManifest.xml

@@ -21,7 +21,6 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -105,5 +104,4 @@
             android:value="@integer/google_play_services_version" />
 
     </application>
-
 </manifest>

app/src/main/java/uk/ac/sussex/wear/android/datalogger/AboutActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017. Mathias Ciliberto, Francisco Javier Ordoñez Morales,
- * Hristijan Gjoreski, Daniel Roggen
+ * Hristijan Gjoreski, Daniel Roggen, Clara Wurm
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -30,6 +30,8 @@
  * Created by ThiasTux.
  */
 
+// class for the 'About" Activity screen
+
 public class AboutActivity extends AppCompatActivity {
 
     @Override

app/src/main/java/uk/ac/sussex/wear/android/datalogger/Constants.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017. Mathias Ciliberto, Francisco Javier Ordoñez Morales,
- * Hristijan Gjoreski, Daniel Roggen
+ * Hristijan Gjoreski, Daniel Roggen, Clara Wurm
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -113,22 +113,25 @@ private Constants() {
 
 
     // Names for each sensor/collector with log files associated
+    public static final String SENSOR_NAME_CELL = "Cells";
+    public static final String SENSOR_NAME_WIFI = "WiFi";
+    public static final String SENSOR_NAME_BLUETOOTH = "Bluetooth";
     public static final String SENSOR_NAME_API_HAR = "API_HAR";
     public static final String SENSOR_NAME_LABELS = "Labels";
     public static final String SENSOR_NAME_ACC = "Accelerometer";
     public static final String SENSOR_NAME_GYR = "Gyroscope";
     public static final String SENSOR_NAME_MAG = "Magnetometer";
     public static final String SENSOR_NAME_MIC = "Audio";
     public static final String SENSOR_NAME_BAT = "Battery";
-    public static final String SENSOR_NAME_CELL = "Cells";
+
     public static final String SENSOR_NAME_DEPR_CELL = "DeprCells";
     public static final String SENSOR_NAME_LOC = "Location";
     public static final String SENSOR_NAME_SAT = "GPS";
     public static final String SENSOR_NAME_TEMP = "Temperature";
     public static final String SENSOR_NAME_LT = "Ambient";
     public static final String SENSOR_NAME_PRES = "Pressure";
     public static final String SENSOR_NAME_HUM = "Humidity";
-    public static final String SENSOR_NAME_WIFI = "WiFi";
+
     public static final String SENSOR_NAME_ORIEN = "Orientation";
     public static final String SENSOR_NAME_LIN_ACC = "LinearAcceleration";
     public static final String SENSOR_NAME_GRA = "Gravity";

app/src/main/java/uk/ac/sussex/wear/android/datalogger/DisplayActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017. Mathias Ciliberto, Francisco Javier Ordoñez Morales,
- * Hristijan Gjoreski, Daniel Roggen
+ * Hristijan Gjoreski, Daniel Roggen, Clara Wurm
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -504,6 +504,7 @@ public void refreshContentLayout() {
             menu.findItem(R.id.action_pair).setVisible(false);
     }
 
+    // IMPORTANT ! this creates the menu button
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.

app/src/main/java/uk/ac/sussex/wear/android/datalogger/SettingsActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017. Mathias Ciliberto, Francisco Javier Ordoñez Morales,
- * Hristijan Gjoreski, Daniel Roggen
+ * Hristijan Gjoreski, Daniel Roggen, Clara Wurm
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -48,6 +48,9 @@
  * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
  * API Guide</a> for more information on developing a Settings UI.
  */
+
+// child class for 'Settings' Activity screen
+
 public class SettingsActivity extends AppCompatPreferenceActivity {
 
     private static final String TAG = SettingsActivity.class.getSimpleName();
@@ -209,16 +212,19 @@ public void onCreate(Bundle savedInstanceState) {
             // to their values. When their values change, their summaries are
             // updated to reflect the new value, per the Android Design
             // guidelines
+            bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_cells)));
+            bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_WiFi)));
+            bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_Bluetooth)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_accelerometer)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_gyroscope)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_magnetometer)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_microphone)));
-            bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_cells)));
+
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_temperature)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_light)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_pressure)));
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_humidity)));
-            bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_WiFi)));
+
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_sensors_key_samplingPeriod_orientation)));
         }