Fixed data log manager crash if there are no remote events, and fixed issue with some versions of sqlite not liking me using 'false' to mean '0' - I don't know why it worked on my test phone!

This commit is contained in:
Graham Jones
2022-02-14 20:18:38 +00:00
parent 6aad276777
commit fb4ea0dcad
8 changed files with 4 additions and 4 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

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

View File

@@ -409,7 +409,7 @@ public class LogManager {
long endDateMillis = currentDateMillis - 1000 * mEventDuration; long endDateMillis = currentDateMillis - 1000 * mEventDuration;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String endDateStr = dateFormat.format(new Date(endDateMillis)); String endDateStr = dateFormat.format(new Date(endDateMillis));
String whereClauseUploaded = "uploaded = false"; String whereClauseUploaded = "uploaded = 0";
String whereClauseDate = "DataTime<?"; String whereClauseDate = "DataTime<?";
String whereClause = whereClauseStatus + " AND " + whereClauseUploaded + " AND " + whereClauseDate; String whereClause = whereClauseStatus + " AND " + whereClauseUploaded + " AND " + whereClauseDate;

View File

@@ -276,8 +276,8 @@ public class LogManagerControlActivity extends AppCompatActivity {
new int[]{R.id.event_date_remote_tv, R.id.event_type_remote_tv, R.id.event_subtype_remote_tv, new int[]{R.id.event_date_remote_tv, R.id.event_type_remote_tv, R.id.event_subtype_remote_tv,
R.id.event_alarmState_remote_tv, R.id.event_notes_remote_tv}); R.id.event_alarmState_remote_tv, R.id.event_notes_remote_tv});
lv.setAdapter(adapter); lv.setAdapter(adapter);
Log.i(TAG,"adapter[0]="+adapter.getItem(0)); //Log.i(TAG,"adapter[0]="+adapter.getItem(0));
Log.i(TAG,"adapter[3]="+adapter.getItem(3)); //Log.i(TAG,"adapter[3]="+adapter.getItem(3));
} else { } else {
//mUtil.showToast("No Remote Events"); //mUtil.showToast("No Remote Events");
Log.i(TAG, "UpdateUi: No Remote Events"); Log.i(TAG, "UpdateUi: No Remote Events");