gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with default logging preference settings being incorrect

Browse Source
This commit is contained in:
Graham Jones
2022-01-28 23:04:44 +00:00
parent 438f0cb0b9
commit fd1aff80b1
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-4.0.0b.apk Normal file
View File

Binary file not shown.

2
app/src/main/AndroidManifest.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector"
android:versionCode="92"
android:versionName="4.0.0a">
android:versionName="4.0.0b">
<!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

4
app/src/main/java/uk/org/openseizuredetector/OsdUtil.java
View File

@@ -137,8 +137,8 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac
try {
mLogAlarms = SP.getBoolean("LogAlarms", true);
Log.v(TAG, "updatePrefs() - mLogAlarms = " + mLogAlarms);
mLogData = SP.getBoolean("LogData", false);
Log.v(TAG, "updatePrefs() - mLogData = " + mLogData);
mLogData = SP.getBoolean("LogData", true);
Log.v(TAG, "OsdUtil.updatePrefs() - mLogData = " + mLogData);
mLogSystem = SP.getBoolean("LogSystem", true);
Log.v(TAG, "updatePrefs() - mLogSystem = " + mLogSystem);

4
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -1211,7 +1211,7 @@ public class SdServer extends Service implements SdDataReceiver {
Log.v(TAG, "updatePrefs() - mLogAlarms = " + mLogAlarms);
mUtil.writeToSysLogFile("updatePrefs() - mLogAlarms = " + mLogAlarms);
mLogData = SP.getBoolean("LogData", true);
Log.v(TAG, "updatePrefs() - mLogData = " + mLogData);
Log.v(TAG, "SdServer.updatePrefs() - mLogData = " + mLogData);
mUtil.writeToSysLogFile( "updatePrefs() - mLogData = " + mLogData);
mLogDataRemote = SP.getBoolean("LogDataRemote", false);
Log.v(TAG, "updatePrefs() - mLogDataRemote = " + mLogDataRemote);
@@ -1589,9 +1589,9 @@ public class SdServer extends Service implements SdDataReceiver {
if (mEventsTimer != null) {
Log.v(TAG, "stopEventsTimer(): timer already running - cancelling it.");
mUtil.writeToSysLogFile("stopEventsTimer() - stopping timer");
mEventsTimer.mIsRunning = false;
mEventsTimer.cancel();
mEventsTimer = null;
mEventsTimer.mIsRunning = false;
} else {
Log.v(TAG, "stopEventsTimer(): timer not running - not doing anything.");
}

18
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -86,6 +86,15 @@ public class StartupActivity extends Activity {
.addCommaSeparatedEmailAddresses("crashreports@openseizuredetector.org.uk,")
.build();
// Read the default settings from the xml preferences files, so we do
// not have to use the hard coded ones in the java files.
PreferenceManager.setDefaultValues(this, R.xml.alarm_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.seizure_detector_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.network_passive_datasource_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.logging_prefs, true);
mHandler = new Handler();
mUtil = new OsdUtil(getApplicationContext(), mHandler);
@@ -100,15 +109,6 @@ public class StartupActivity extends Activity {
setContentView(R.layout.startup_activity);
// Read the default settings from the xml preferences files, so we do
// not have to use the hard coded ones in the java files.
PreferenceManager.setDefaultValues(this, R.xml.alarm_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.seizure_detector_prefs, true);
PreferenceManager.setDefaultValues(this, R.xml.network_passive_datasource_prefs, true);
Button b;

2
app/src/main/res/xml/alarm_prefs.xml
View File

@@ -70,6 +70,7 @@
android:title="Enable Phone Call Alarm" />
</PreferenceCategory>
-->
<!--
<PreferenceCategory android:title="@string/AlarmLoggingTitle">
<CheckBoxPreference
android:defaultValue="true"
@@ -82,4 +83,5 @@
android:summary="@string/log_data_summary"
android:title="@string/log_data_title"/>
</PreferenceCategory>
-->
</PreferenceScreen>

5
app/src/main/res/xml/general_prefs.xml
View File

@@ -6,7 +6,7 @@
android:summary="@string/select_datasource_summary"
android:entries="@array/datasource_list"
android:entryValues="@array/datasource_list_values"
android:defaultValue="Garmin"
android:defaultValue="Phone"
android:dialogTitle="@string/select_datasource_title" />
<Preference
android:key="SelectBLEDevice"
@@ -14,6 +14,7 @@
android:summary="@string/select_ble_device_desc"
android:widgetLayout="@layout/pref_select_ble_device_button"
/>
<!--
<CheckBoxPreference
android:defaultValue="true"
android:key="LogAlarms"
@@ -55,6 +56,8 @@
android:key="OSDUrl"
android:summary="@string/remote_url_summary"
android:title="@string/remote_url_title" />
-->
<CheckBoxPreference
android:defaultValue="false"
android:key="PreventSleep"

4
app/src/main/res/xml/logging_prefs.xml
View File

@@ -16,7 +16,7 @@
android:summary="@string/eventDurationSummary"
android:title="@string/eventDurationTitle" />
<CheckBoxPreference
android:defaultValue="false"
android:defaultValue="true"
android:key="AutoPruneDb"
android:summary="@string/AutoPruneDbSummary"
android:title="@string/AutoPruneDbTitle" />
@@ -27,7 +27,7 @@
android:title="@string/dataRetentionPeriodTitle" />
<CheckBoxPreference
android:defaultValue="false"
android:defaultValue="true"
android:key="LogDataRemote"
android:summary="@string/log_data_remote_summary"
android:title="@string/log_data_remote_title" />