From 54fe2e64d335da7120a18edde6d0533fa3582b60 Mon Sep 17 00:00:00 2001 From: JulioV Date: Tue, 31 Mar 2020 18:17:01 -0400 Subject: [PATCH] Fix refresh all settings in client --- .../java/com/aware/phone/Aware_Client.java | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/aware-phone/src/main/java/com/aware/phone/Aware_Client.java b/aware-phone/src/main/java/com/aware/phone/Aware_Client.java index d2adf294c..21739436e 100755 --- a/aware-phone/src/main/java/com/aware/phone/Aware_Client.java +++ b/aware-phone/src/main/java/com/aware/phone/Aware_Client.java @@ -235,6 +235,7 @@ protected void onProgressUpdate(Preference... values) { if (ListPreference.class.isInstance(pref)) { ListPreference list = (ListPreference) findPreference(pref.getKey()); + list.setValue(Aware.getSetting(getApplicationContext(), pref.getKey())); list.setSummary(list.getEntry()); } @@ -364,38 +365,82 @@ protected void onResume() { findPreference(Aware_Preferences.DEVICE_LABEL), findPreference(Aware_Preferences.AWARE_VERSION), findPreference(Aware_Preferences.STATUS_ACCELEROMETER), + findPreference(Aware_Preferences.FREQUENCY_ACCELEROMETER), + findPreference(Aware_Preferences.FREQUENCY_ACCELEROMETER_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_ACCELEROMETER), findPreference(Aware_Preferences.STATUS_APPLICATIONS), + findPreference(Aware_Preferences.FREQUENCY_APPLICATIONS), findPreference(Aware_Preferences.STATUS_BAROMETER), + findPreference(Aware_Preferences.FREQUENCY_BAROMETER), + findPreference(Aware_Preferences.FREQUENCY_BAROMETER_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_BAROMETER), findPreference(Aware_Preferences.STATUS_BATTERY), findPreference(Aware_Preferences.STATUS_BLUETOOTH), + findPreference(Aware_Preferences.FREQUENCY_BLUETOOTH), findPreference(Aware_Preferences.STATUS_CALLS), findPreference(Aware_Preferences.STATUS_COMMUNICATION_EVENTS), findPreference(Aware_Preferences.STATUS_CRASHES), findPreference(Aware_Preferences.STATUS_ESM), findPreference(Aware_Preferences.STATUS_GRAVITY), + findPreference(Aware_Preferences.FREQUENCY_GRAVITY), + findPreference(Aware_Preferences.FREQUENCY_GRAVITY_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_GRAVITY), findPreference(Aware_Preferences.STATUS_GYROSCOPE), + findPreference(Aware_Preferences.FREQUENCY_GYROSCOPE), + findPreference(Aware_Preferences.FREQUENCY_GYROSCOPE_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_GYROSCOPE), findPreference(Aware_Preferences.STATUS_INSTALLATIONS), findPreference(Aware_Preferences.STATUS_KEYBOARD), + findPreference(Aware_Preferences.MASK_KEYBOARD), findPreference(Aware_Preferences.STATUS_LIGHT), + findPreference(Aware_Preferences.FREQUENCY_LIGHT), + findPreference(Aware_Preferences.FREQUENCY_LIGHT_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_LIGHT), findPreference(Aware_Preferences.STATUS_LINEAR_ACCELEROMETER), + findPreference(Aware_Preferences.FREQUENCY_LINEAR_ACCELEROMETER), + findPreference(Aware_Preferences.FREQUENCY_LINEAR_ACCELEROMETER_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_LINEAR_ACCELEROMETER), findPreference(Aware_Preferences.STATUS_LOCATION_GPS), + findPreference(Aware_Preferences.FREQUENCY_LOCATION_GPS), + findPreference(Aware_Preferences.MIN_LOCATION_GPS_ACCURACY), findPreference(Aware_Preferences.STATUS_LOCATION_NETWORK), + findPreference(Aware_Preferences.FREQUENCY_LOCATION_NETWORK), + findPreference(Aware_Preferences.MIN_LOCATION_NETWORK_ACCURACY), + findPreference(Aware_Preferences.LOCATION_EXPIRATION_TIME), + findPreference(Aware_Preferences.LOCATION_GEOFENCE), + findPreference(Aware_Preferences.LOCATION_SAVE_ALL), findPreference(Aware_Preferences.STATUS_LOCATION_PASSIVE), findPreference(Aware_Preferences.STATUS_MAGNETOMETER), + findPreference(Aware_Preferences.FREQUENCY_MAGNETOMETER), + findPreference(Aware_Preferences.FREQUENCY_MAGNETOMETER_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_MAGNETOMETER), findPreference(Aware_Preferences.STATUS_MESSAGES), findPreference(Aware_Preferences.STATUS_MQTT), findPreference(Aware_Preferences.STATUS_NETWORK_EVENTS), findPreference(Aware_Preferences.STATUS_NETWORK_TRAFFIC), + findPreference(Aware_Preferences.FREQUENCY_NETWORK_TRAFFIC), findPreference(Aware_Preferences.STATUS_NOTIFICATIONS), findPreference(Aware_Preferences.STATUS_PROCESSOR), + findPreference(Aware_Preferences.FREQUENCY_PROCESSOR), findPreference(Aware_Preferences.STATUS_PROXIMITY), + findPreference(Aware_Preferences.FREQUENCY_PROXIMITY), + findPreference(Aware_Preferences.FREQUENCY_PROXIMITY_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_PROXIMITY), findPreference(Aware_Preferences.STATUS_ROTATION), + findPreference(Aware_Preferences.FREQUENCY_ROTATION), + findPreference(Aware_Preferences.FREQUENCY_ROTATION_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_ROTATION), findPreference(Aware_Preferences.STATUS_SCREEN), findPreference(Aware_Preferences.STATUS_SIGNIFICANT_MOTION), findPreference(Aware_Preferences.STATUS_TEMPERATURE), + findPreference(Aware_Preferences.FREQUENCY_TEMPERATURE), + findPreference(Aware_Preferences.FREQUENCY_TEMPERATURE_ENFORCE), + findPreference(Aware_Preferences.THRESHOLD_TEMPERATURE), findPreference(Aware_Preferences.STATUS_TELEPHONY), findPreference(Aware_Preferences.STATUS_TIMEZONE), + findPreference(Aware_Preferences.FREQUENCY_TIMEZONE), findPreference(Aware_Preferences.STATUS_WIFI), + findPreference(Aware_Preferences.FREQUENCY_WIFI), findPreference(Aware_Preferences.STATUS_WEBSERVICE), findPreference(Aware_Preferences.MQTT_SERVER), findPreference(Aware_Preferences.MQTT_PORT), @@ -416,8 +461,12 @@ protected void onResume() { findPreference(Aware_Preferences.DEBUG_DB_SLOW), findPreference(Aware_Preferences.FOREGROUND_PRIORITY), findPreference(Aware_Preferences.STATUS_TOUCH), + findPreference(Aware_Preferences.MASK_TOUCH_TEXT), findPreference(Aware_Preferences.STATUS_WEBSOCKET), - findPreference(Aware_Preferences.WEBSOCKET_SERVER) + findPreference(Aware_Preferences.WEBSOCKET_SERVER), + findPreference(Aware_Preferences.DEBUG_FLAG), + findPreference(Aware_Preferences.DEBUG_TAG), + findPreference(Aware_Preferences.ENFORCE_FREQUENCY_ALL) ); }