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

Converted all localDB select queries to async tasks

Browse Source
This commit is contained in:
Graham Jones
2022-01-21 22:34:55 +00:00
parent 40251112b6
commit 8c7cd852bb
3 changed files with 207 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

297
app/src/main/java/uk/org/openseizuredetector/LogManager.java
View File

@@ -295,7 +295,7 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
* @param statusVal
* @return true on success or false on failure
*/
public boolean setDatapointStatus(int id, int statusVal) {
public boolean setDatapointStatus(Long id, int statusVal) {
Log.d(TAG, "setDatapointStatus() - id=" + id + ", statusVal=" + statusVal);
Cursor c = null;
ContentValues cv = new ContentValues();
@@ -309,36 +309,27 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
/**
* getDatapointsJSON() Returns a JSON Object of all of the datapoints in the local database
* between endDateStr-duration and endDateStr
* Return a JSON string representing all the datapoints between startDate and endDate
*
* @param endDateStr String representation of the period end date
* @param duration Duration in minutes.
* @return JSONObject of all the datapoints in the range.
* @return True on successful start or false if call fails.
*/
public String getDatapointsbyDate(String startDateStr, String endDateStr) {
public boolean getDatapointsByDate(String startDateStr, String endDateStr, Consumer<String> callback) {
Log.d(TAG, "getDatapointsbyDate() - startDateStr=" + startDateStr + ", endDateStr=" + endDateStr);
Cursor c = null;
String retVal;
try {
//String selectStr = "DataTime>=? and DataTime<=?";
//String[] selectArgs = {startDateStr, endDateStr};
//c = mOSDDb.getWritableDatabase().query(mDbTableName, null,
// null, null, null, null, null);
c = mOSDDb.getWritableDatabase().rawQuery(
"Select * from " + mDbTableName
+ " where dataTime>= '" + startDateStr
+ "' and dataTime<= '" + endDateStr + "'",
null);
retVal = cursor2Json(c);
} catch (Exception e) {
Log.d(TAG, "Error selecting datapoints" + e.toString());
retVal = null;
String[] columns = {"*"};
String whereClause = "DataTime>? AND DataTime<?";
String[] whereArgs = {startDateStr, endDateStr};
new SelectQueryTask(mDbTableName, columns, whereClause, whereArgs,
null, null, "dataTime DESC", (Cursor cursor) -> {
Log.v(TAG, "getDataPointsByDate - returned " + cursor);
if (cursor != null) {
callback.accept(cursor2Json(cursor));
} else {
callback.accept(null);
}
return (retVal);
}).execute();
return (true);
}
//Consumer<JSONObject> callback
/**
* Return an array list of objects representing the events in the database by calling the specified callback function.
@@ -350,17 +341,8 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
Log.v(TAG, "getEventsList - includeWarnings=" + includeWarnings);
ArrayList<HashMap<String, String>> eventsList = new ArrayList<>();
String[] whereArgs;
String whereClause;
if (includeWarnings) {
String[] whereArgsWarnings = { "1", "2", "3", "5"};
whereClause = "Status in (?, ?, ?, ?)";
whereArgs = whereArgsWarnings;
} else {
whereClause = "Status in (?, ?, ?)";
String[] whereArgsNoWarnings = { "2", "3", "5"};
whereArgs = whereArgsNoWarnings;
}
String[] whereArgs = getEventWhereArgs(includeWarnings);
String whereClause = getEventWhereClause(includeWarnings);
//sqlStr = "SELECT * from " + mDbTableName + " where Status in (" + statusListStr + ") order by dataTime desc;";
String[] columns = {"*"};
new SelectQueryTask(mDbTableName, columns, whereClause, whereArgs,
@@ -368,7 +350,7 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
Log.v(TAG, "getEventsList - returned " + cursor);
if (cursor != null) {
Log.v(TAG, "getEventsList - returned " + cursor.getCount() + " records");
while (cursor.moveToNext()) {
while (!cursor.isAfterLast()) {
HashMap<String, String> event = new HashMap<>();
//event.put("id", cursor.getString(cursor.getColumnIndex("id")));
event.put("dataTime", cursor.getString(cursor.getColumnIndex("dataTime")));
@@ -378,6 +360,7 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
event.put("uploaded", cursor.getString(cursor.getColumnIndex("uploaded")));
//event.put("dataJSON", cursor.getString(cursor.getColumnIndex("dataJSON")));
eventsList.add(event);
cursor.moveToNext();
}
}
callback.accept(eventsList);
@@ -412,154 +395,135 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
}
public boolean getNextEventToUpload(Consumer<Long> callback) {
Log.v(TAG, "getNextEventToUpload");
// Based on https://stackoverflow.com/questions/24827312/is-a-good-practice-create-anonymous-asynctask-for-parallel-small-known-freeze-pr
new AsyncTask<Void, Void, Long>() {
@Override
protected Long doInBackground(Void... params) {
Log.v(TAG, "getEventsNextEventToUpload.doInBackground");
Long eventId;
eventId = _getNextEventToUpload(false);
if (eventId == -1) {
eventId = _getNextEventToUpload(true);
}
return (eventId);
}
@Override
protected void onPostExecute(final Long result) {
callback.accept(result);
}
}.execute();
return (true);
}
/**
* Return the ID of the next event (alarm, warning, fall etc that needs to be uploaded (alarm or warning condition and has not yet been uploaded.
*
* @param includeWarnings - whether to include warnings in the list of events, or just alarm conditions.
* @return True on successful start or false if call fails.
*/
public Long _getNextEventToUpload(boolean includeWarnings) {
Log.v(TAG, "getNextEventToUpload(" + includeWarnings + ")");
Time tnow = new Time(Time.getCurrentTimezone());
tnow.setToNow();
String dateStr = tnow.format("%Y-%m-%d");
String SQLStr = "SQLStr";
String statusListStr;
String recordStr;
Long recordId;
public boolean getNextEventToUpload(boolean includeWarnings, Consumer<Long> callback) {
Log.v(TAG, "getNextEventToUpload - includeWarnings=" + includeWarnings);
if (includeWarnings) {
statusListStr = "1,2,3,5"; // Warning, Alarm, Fall, Manual Alarm
} else {
statusListStr = "2,3,5"; // Alarm, Fall, Manual Alarm
}
String[] whereArgsStatus = getEventWhereArgs(includeWarnings);
String whereClauseStatus = getEventWhereClause(includeWarnings);
String[] columns = {"*"};
// Do not try to upload very recent events so that we have chance to record the post-event data before uploading it.
long currentDateMillis = new Date().getTime();
long endDateMillis = currentDateMillis - 1000 * mEventDuration;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String endDateStr = dateFormat.format(new Date(endDateMillis));
try {
SQLStr = "SELECT * from " + mDbTableName + " where uploaded=false and Status in (" + statusListStr + ") and DataTime<'" + endDateStr + "';";
Cursor resultSet = mOSDDb.getWritableDatabase().rawQuery(SQLStr, null);
resultSet.moveToFirst();
if (resultSet.getCount() == 0) {
String whereClauseUploaded = "uploaded = false";
String whereClauseDate = "DataTime<?";
String whereClause = whereClauseStatus + " AND " + whereClauseUploaded + " AND " + whereClauseDate;
String[] whereArgs = new String[ whereArgsStatus.length + 1];
for (int i = 0; i<whereArgsStatus.length; i++) {
whereArgs[i] = whereArgsStatus[i];
}
whereArgs[whereArgsStatus.length] = endDateStr;
new SelectQueryTask(mDbTableName, columns, whereClause, whereArgs,
null, null, "dataTime DESC", (Cursor cursor) -> {
Log.v(TAG, "getEventsList - returned " + cursor);
Long recordId = new Long(-1);
if (cursor != null) {
Log.v(TAG, "getNextEventToUpload - returned " + cursor.getCount() + " records");
cursor.moveToFirst();
if (cursor.getCount() == 0) {
Log.v(TAG, "getNextEventToUpload() - no events to Upload - exiting");
recordId = new Long(-1);
} else {
recordStr = resultSet.getString(3);
recordId = resultSet.getLong(0);
String recordStr = cursor.getString(3);
recordId = cursor.getLong(0);
Log.d(TAG, "getNextEventToUpload(): id=" + recordId + ", recordStr=" + recordStr);
}
} catch (SQLException e) {
Log.e(TAG, "getNextEventToUpload(): Error selecting Data: " + e.toString());
Log.e(TAG, "SQLStr was " + SQLStr);
recordStr = "ERROR";
recordId = new Long(-1);
}
return (recordId);
callback.accept(recordId);
}).execute();
return (true);
}
/**
* Return the ID of the datapoint that is closest to date/time string dateStr
* Based on https://stackoverflow.com/questions/45749046/sql-get-nearest-date-record
*
* @return True on successful start or false if call fails.
*/
public int getNearestDatapointToDate(String dateStr) {
Log.v(TAG, "getNearestDatapointToDate()");
String SQLStr = "SQLStr";
//String recordStr;
int recordId;
try {
SQLStr = "SELECT *, (julianday(dataTime)-julianday(datetime('" + dateStr + "'))) as ddiff from " + mDbTableName + " order by ABS(ddiff) asc;";
//SQLStr = "SELECT * from "+ mDbTableName + " ;";
Cursor resultSet = mOSDDb.getWritableDatabase().rawQuery(SQLStr, null);
resultSet.moveToFirst();
if (resultSet.getCount() == 0) {
Log.v(TAG, "getNearestDatapointToDate() - no datapoints found - exiting");
recordId = -1;
public boolean getNearestDatapointToDate(String dateStr, Consumer<Long> callback) {
Log.v(TAG, "getNextEventToDate - dateStr=" + dateStr);
String[] columns = {"*","(julianday(dataTime)-julianday(datetime('" + dateStr + "'))) as ddiff"};
//SQLStr = "SELECT *, (julianday(dataTime)-julianday(datetime('" + dateStr + "'))) as ddiff from " + mDbTableName + " order by ABS(ddiff) asc;";
String orderByStr = "ABS(ddiff) asc";
new SelectQueryTask(mDbTableName, columns, null, null,
null, null, orderByStr, (Cursor cursor) -> {
Log.v(TAG, "getEventsNearestDatapointToDate - returned " + cursor);
Long recordId = new Long(-1);
if (cursor != null) {
Log.v(TAG, "getNearestDatapointToDate - returned " + cursor.getCount() + " records");
cursor.moveToFirst();
if (cursor.getCount() == 0) {
Log.v(TAG, "getNearestDatapointToDate() - no events to Upload - exiting");
recordId = new Long(-1);
} else {
recordId = resultSet.getInt(0);
//resultSet.moveToFirst();
//recordStr = cursor2Json(resultSet); //getDatapointById(recordId);
Log.d(TAG, "getNearestDatapointToDate(): id=" + recordId + ", count=" + resultSet.getCount());
String recordStr = cursor.getString(3);
recordId = cursor.getLong(0);
Log.d(TAG, "getNearestDatapointToDate(): id=" + recordId + ", recordStr=" + recordStr);
}
} catch (SQLException e) {
Log.e(TAG, "getNearestDatapointToDate(): Error selecting Data: " + e.toString());
Log.e(TAG, "SQLStr was " + SQLStr);
//recordStr = "ERROR";
recordId = -1;
}
return (recordId);
callback.accept(recordId);
}).execute();
return (true);
}
/**
* Return the number of events stored in the local database
* Return the number of events stored in the local database (via a callback).
*
* @param includeWarnings - whether to include warnings in the list of events, or just alarm conditions.
* @return True on successful start or false if call fails.
*/
public int getLocalEventsCount(boolean includeWarnings) {
//Log.v(TAG, "getLocalEventsCount()");
String SQLStr = "SQLStr";
String statusListStr;
if (includeWarnings) {
statusListStr = "1,2,3,5"; // Warning, Alarm, Fall, Manual Alarm
} else {
statusListStr = "2,3,5"; // Alarm, Fall, Manual Alarm
}
try {
SQLStr = "SELECT * from " + mDbTableName + " where Status in (" + statusListStr + ");";
Cursor resultSet = mOSDDb.getWritableDatabase().rawQuery(SQLStr, null);
resultSet.moveToFirst();
return (resultSet.getCount());
} catch (SQLException e) {
Log.e(TAG, "getLocalEventsCount(): Error selecting Data: " + e.toString());
Log.e(TAG, "SQLStr was " + SQLStr);
return (0);
public boolean getLocalEventsCount(boolean includeWarnings, Consumer<Long> callback) {
Log.v(TAG, "getLocalEventsCount- includeWarnings=" + includeWarnings);
String[] whereArgs = getEventWhereArgs(includeWarnings);
String whereClause = getEventWhereClause(includeWarnings);
String[] columns = {"*"};
new SelectQueryTask(mDbTableName, columns, whereClause, whereArgs,
null, null, null, (Cursor cursor) -> {
Log.v(TAG, "getLocalEventsCount - returned " + cursor);
Long eventCount = Long.valueOf(0);
if (cursor != null) {
eventCount = Long.valueOf(cursor.getCount());
Log.v(TAG, "getLocalEventsCount - returned " + eventCount + " records");
}
callback.accept(eventCount);
}).execute();
return (true);
}
/**
* Return the number of datapoints stored in the local database
* Return the number of datapoints stored in the local database (via a callback).
*
* @return True on successful start or false if call fails.
*/
public int getLocalDatapointsCount() {
//Log.v(TAG, "getLocalDatapointsCount()");
String SQLStr = "SQLStr";
String statusListStr;
public boolean getLocalDatapointsCount(Consumer<Long> callback) {
Log.v(TAG, "getLocalDatapointsCount");
String[] whereArgs = null;
String whereClause = null;
String[] columns = {"*"};
new SelectQueryTask(mDbTableName, columns, whereClause, whereArgs,
null, null, null, (Cursor cursor) -> {
Log.v(TAG, "getLocalDatapointsCount - returned " + cursor);
Long eventCount = Long.valueOf(0);
if (cursor != null) {
eventCount = Long.valueOf(cursor.getCount());
Log.v(TAG, "getLocalDatapointsCount - returned " + eventCount + " records");
}
callback.accept(eventCount);
}).execute();
return (true);
}
try {
SQLStr = "SELECT * from " + mDbTableName + ";";
Cursor resultSet = mOSDDb.getWritableDatabase().rawQuery(SQLStr, null);
resultSet.moveToFirst();
return (resultSet.getCount());
} catch (SQLException e) {
Log.e(TAG, "getLocalDatapointsCount(): Error selecting Data: " + e.toString());
Log.e(TAG, "SQLStr was " + SQLStr);
return (0);
}
}
/**
* Executes the sqlite query (=SELECT statement)
@@ -630,6 +594,31 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
}
private String getEventWhereClause(boolean includeWarnings) {
String whereClause;
if (includeWarnings) {
whereClause = "Status in (?, ?, ?, ?)";
} else {
whereClause = "Status in (?, ?, ?)";
}
return(whereClause);
}
private String[] getEventWhereArgs(boolean includeWarnings) {
String[] whereArgs;
if (includeWarnings) {
String[] whereArgsWarnings = { "1", "2", "3", "5"};
whereArgs = whereArgsWarnings;
} else {
String[] whereArgsNoWarnings = { "2", "3", "5"};
whereArgs = whereArgsNoWarnings;
}
return(whereArgs);
}
/***************************************************************************************
* Remote Database Part
*/
@@ -673,7 +662,7 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
//int eventId = -1;
Log.v(TAG, "uploadSdData()");
// First try uploading full alarms, and only if we do not have any of those, upload warnings.
getNextEventToUpload((Long eventId) -> {
getNextEventToUpload(true, (Long eventId) -> {
if (eventId != -1) {
Log.v(TAG, "uploadSdData() - eventId=" + eventId);
String eventJsonStr = getDatapointById(eventId);
@@ -757,11 +746,10 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
long endDateMillis = eventDateMillis + 1000 * mEventDuration / 2;
dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String datapointsJsonStr = getDatapointsbyDate(
getDatapointsByDate(
dateFormat.format(new Date(startDateMillis)),
dateFormat.format(new Date(endDateMillis)));
dateFormat.format(new Date(endDateMillis)), (String datapointsJsonStr) -> {
Log.v(TAG, "eventCallback() - datapointsJsonStr=" + datapointsJsonStr);
JSONArray dataObj;
mDatapointsToUploadList = new ArrayList<JSONObject>();
try {
@@ -770,9 +758,6 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
for (int i = 0; i < dataObj.length(); i++) {
mDatapointsToUploadList.add(dataObj.getJSONObject(i));
}
//dataObj.put("dataTime", dateFormat.format(new Date()));
//Log.v(TAG, "eventCallback(): Creating Datapoint...SdData="+dataObj.toString());
//mWac.createDatapoint(dataObj,eventId);
} catch (JSONException e) {
Log.v(TAG, "Error Creating JSON Object from string " + datapointsJsonStr);
dataObj = null;
@@ -783,6 +768,8 @@ public class LogManager implements AuthCallbackInterface, EventCallbackInterface
mUploadInProgress = true;
Log.v(TAG, "eventCallback() - starting datapoints upload with eventId " + mCurrentEventId);
uploadNextDatapoint();
});
}
// takes the next datapoint of the list mDatapointsToUploadList and uploads it to the remote server.

48
app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
View File

@@ -82,7 +82,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
@Override
protected void onStop() {
Log.v(TAG,"onStop()");
Log.v(TAG, "onStop()");
super.onStop();
stopUiTimer();
mUtil.unbindFromServer(this, mConnection);
@@ -90,14 +90,14 @@ public class LogManagerControlActivity extends AppCompatActivity {
@Override
protected void onPause() {
Log.v(TAG,"onPause()");
Log.v(TAG, "onPause()");
super.onPause();
//stopUiTimer();
}
@Override
protected void onResume() {
Log.v(TAG,"onResume()");
Log.v(TAG, "onResume()");
super.onResume();
//startUiTimer();
}
@@ -107,10 +107,10 @@ public class LogManagerControlActivity extends AppCompatActivity {
// the mConnection to bind to the service, so we delay half a second to give it chance
// to connect before trying to update the UI for the first time (it happens again periodically using the uiTimer)
if (mConnection.mBound) {
Log.v(TAG,"waitForConnection - Bound!");
Log.v(TAG, "waitForConnection - Bound!");
initialiseServiceConnection();
} else {
Log.v(TAG,"waitForConnection - waiting...");
Log.v(TAG, "waitForConnection - waiting...");
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
@@ -134,16 +134,15 @@ public class LogManagerControlActivity extends AppCompatActivity {
// Populate events list - we only do it once when the activity is created because the query might slow down the UI.
// We could try this code in updateUI() and see though.
// Based on https://www.tutlane.com/tutorial/android/android-sqlite-listview-with-examples
mLm.getEventsList(true, (ArrayList<HashMap<String,String>> eventsList)-> {
mLm.getEventsList(true, (ArrayList<HashMap<String, String>> eventsList) -> {
mEventsList = eventsList;
Log.v(TAG,"initialiseServiceConnection() - set mEventsList");
Log.v(TAG, "initialiseServiceConnection() - set mEventsList - Updating UI");
updateUi();
});
//mEventsList = mLm.getEventsList(true);
}
private void getRemoteEvents() {
// Retrieve events from remote database
mLm.mWac.getEvents((JSONObject remoteEventsObj) -> {
@@ -157,7 +156,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
JSONArray eventsArray = remoteEventsObj.getJSONArray("events");
mRemoteEventsList = new ArrayList<HashMap<String, String>>();
// A bit of a hack to display in reverse chronological order
for (int i = eventsArray.length()-1; i>=0; i--) {
for (int i = eventsArray.length() - 1; i >= 0; i--) {
JSONObject eventObj = eventsArray.getJSONObject(i);
Long id = eventObj.getLong("id");
int osdAlarmState = eventObj.getInt("osdAlarmState");
@@ -175,6 +174,8 @@ public class LogManagerControlActivity extends AppCompatActivity {
eventHashMap.put("desc", desc);
mRemoteEventsList.add(eventHashMap);
}
Log.v(TAG, "getRemoteEvents() - set mRemoteEventsList(). Updating UI");
updateUi();
} catch (JSONException e) {
Log.e(TAG, "getRemoteEvents(): Error Parsing remoteEventsObj: " + e.getMessage());
mUtil.showToast("Error Parsing remoteEventsObj - this should not happen!!!");
@@ -193,12 +194,14 @@ public class LogManagerControlActivity extends AppCompatActivity {
Button btn;
// Local Database Information
if (mLm != null) {
tv = (TextView) findViewById(R.id.num_local_events_tv);
int eventCount = mLm.getLocalEventsCount(true);
tv.setText(String.format("%d", eventCount));
tv = (TextView) findViewById(R.id.num_local_datapoints_tv);
int datapointsCount = mLm.getLocalDatapointsCount();
tv.setText(String.format("%d", datapointsCount));
mLm.getLocalEventsCount(true, (Long eventCount) -> {
TextView tv1 = (TextView) findViewById(R.id.num_local_events_tv);
tv1.setText(String.format("%d", eventCount));
});
mLm.getLocalDatapointsCount((Long datapointsCount) -> {
TextView tv2 = (TextView) findViewById(R.id.num_local_datapoints_tv);
tv2.setText(String.format("%d", datapointsCount));
});
} else {
stopUpdating = false;
}
@@ -222,7 +225,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
lv.setAdapter(adapter);
} else {
//mUtil.showToast("No Remote Events");
Log.d(TAG,"UpdateUi: No Remote Events");
Log.d(TAG, "UpdateUi: No Remote Events");
stopUpdating = false;
}
@@ -245,7 +248,6 @@ public class LogManagerControlActivity extends AppCompatActivity {
} //updateUi();
View.OnClickListener onAuth =
new View.OnClickListener() {
@Override
@@ -320,10 +322,10 @@ public class LogManagerControlActivity extends AppCompatActivity {
new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> adapter, View v, int position, long id) {
Log.v(TAG, "onItemClicKListener() - Position=" + position + ", id=" + id);// Confirmation dialog based on: https://stackoverflow.com/a/12213536/2104584
HashMap<String, String> eventObj = (HashMap<String,String>)adapter.getItemAtPosition(position);
HashMap<String, String> eventObj = (HashMap<String, String>) adapter.getItemAtPosition(position);
Long eventId = Long.parseLong(eventObj.get("uploaded"));
Log.d(TAG,"onItemClickListener(): eventId="+eventId+", eventObj="+eventObj);
if (eventId>0) {
Log.d(TAG, "onItemClickListener(): eventId=" + eventId + ", eventObj=" + eventObj);
if (eventId > 0) {
Intent i = new Intent(getApplicationContext(), EditEventActivity.class);
i.putExtra("eventId", eventId);
startActivity(i);
@@ -337,11 +339,11 @@ public class LogManagerControlActivity extends AppCompatActivity {
new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> adapter, View v, int position, long id) {
Log.v(TAG, "onRemoteEventList Click() - Position=" + position + ", id=" + id);// Confirmation dialog based on: https://stackoverflow.com/a/12213536/2104584
HashMap<String, String> eventObj = (HashMap<String,String>)adapter.getItemAtPosition(position);
HashMap<String, String> eventObj = (HashMap<String, String>) adapter.getItemAtPosition(position);
Long eventId = Long.parseLong(eventObj.get("id"));
Log.d(TAG,"onItemClickListener(): eventId="+eventId+", eventObj="+eventObj);
Log.d(TAG, "onItemClickListener(): eventId=" + eventId + ", eventObj=" + eventObj);
Intent i = new Intent(getApplicationContext(), EditEventActivity.class);
i.putExtra("eventId",eventId);
i.putExtra("eventId", eventId);
startActivity(i);
}
};

3
app/src/main/java/uk/org/openseizuredetector/ReportSeizureActivity.java
View File

@@ -147,7 +147,7 @@ public class ReportSeizureActivity extends AppCompatActivity {
String dateStr=String.format("%4d-%02d-%02d %02d:%02d:30",mYear,mMonth+1,mDay, mHour, mMinute);
Log.v(TAG, "onOk() - dateSTr="+dateStr);
mMsg = "Finding Nearest Datapoint to Date/Time "+dateStr+"...";
int id = mLm.getNearestDatapointToDate(dateStr);
mLm.getNearestDatapointToDate(dateStr, (Long id) -> {
mMsg = mMsg + "\nNearest Datapoint is "+id;
Log.v(TAG, "onOK() - nearest datapoint is "+id);
if (id!=-1) {
@@ -159,6 +159,7 @@ public class ReportSeizureActivity extends AppCompatActivity {
mMsg = mMsg + "\n*** Datapoint not found - not doing anything ***";
osdUtil.showToast(getString(R.string.DatapointNotFound));
}
});
}
};
View.OnClickListener onCancel =