diff --git a/CHANGELOG.md b/CHANGELOG.md index be6ead9..bd79101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ OpenSeizureDetector Android App - Change Log ============================================ - V4.2.10 - fixed (infrequent) crash when opening data sharing page. + V4.2.10 - fixed (infrequent) crash when opening data sharing page (#195), and crash if log manager fails to start (#196) V4.2.9 - fixed crash when using Polish translation. V4.2.8 - - Fixed crash in export data function when using european style comma based decimal separator. diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManager.java b/app/src/main/java/uk/org/openseizuredetector/LogManager.java index 8bc9ed9..babd01d 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManager.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManager.java @@ -381,9 +381,15 @@ public class LogManager { values.put("notes", desc); values.put("dataJSON", dataJSON); - long newRowId = mOsdDb.insert(mEventsTableName, null, values); - Log.d(TAG, "createLocalEvent(): Created Row ID" + newRowId); - return true; + if (mOsdDb != null) { + long newRowId = mOsdDb.insert(mEventsTableName, null, values); + Log.d(TAG, "createLocalEvent(): Created Row ID" + newRowId); + return true; + } else { + Log.e(TAG,"createLocalEvent() - mOsdDb is null"); + mUtil.showToast(mContext.getString(R.string.error_failed_to_create_local_event)); + return false; + } } /** diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java index aeca9dd..d17f572 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java @@ -219,7 +219,7 @@ public class LogManagerControlActivity extends AppCompatActivity { }); } else { Log.e(TAG,"ERROR: initialiseServiceConnection() - mLm is null"); - mUtil.showToast("ERROR: Failed to start Log Manager"); + mUtil.showToast(getString(R.string.error_failed_to_start_log_manager)); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1fdabe3..d9611f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -576,4 +576,6 @@ Bluetooth Permissions Required Bluetooth permissions are required to communicate with the bluetooth (BLE) data source Restart Server + ERROR: failed to create local event + ERROR: Failed to start Log Manager