Skip to content

WIP - Refactor of notes functionality #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescr merged 4 commits into from
Jan 22, 2026
Merged

WIP - Refactor of notes functionality #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
751683d
Refactor Note List, add unit test
jamescr Jan 20, 2026
9beed2d
Open Street Map Notes Upload clases and add unit test
jamescr Jan 21, 2026
4078879
Refactor: Delete EditNoteDialogOnClickListener Java class
jamescr Jan 21, 2026
9884288
Refactor(test): Replace PowerMock with Mockito
jamescr Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ dependencies {
// Mockito framework
testImplementation "org.mockito:mockito-core:3.12.4"

testImplementation 'org.powermock:powermock-core:2.0.9'
testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
// Required for local unit tests. Prevent null in JSONObject, JSONArray, etc.
testImplementation 'org.json:json:20240303'

Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
android:label="@string/wplist" />
<activity
android:name=".activity.NoteList"
android:theme="@style/AppTheme"
android:label="@string/notelist" />
<activity
android:name=".activity.TrackDetail"
Expand All @@ -69,6 +70,8 @@
android:label="@string/osm_upload"
android:exported="true">
</activity>
<activity android:name=".activity.OpenStreetMapNotesUpload"
android:theme="@style/AppTheme"/>
<activity
android:name="net.openid.appauth.RedirectUriReceiverActivity"
tools:node="replace" android:exported="true">
Expand Down Expand Up @@ -113,7 +116,6 @@
</intent-filter>
</activity>
<activity android:name=".activity.AvailableLayouts" />
<activity android:name=".activity.OpenStreetMapNotesUpload"/>

<service
android:name=".service.gps.GPSLogger"
Expand Down
245 changes: 91 additions & 154 deletions app/src/main/java/net/osmtracker/activity/NoteList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,70 @@
package net.osmtracker.activity;

import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.os.Bundle;
import android.view.ContextMenu;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.Button;
import android.widget.CursorAdapter;
import android.widget.EditText;
import android.widget.ListView;

import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import net.osmtracker.R;
import net.osmtracker.adapter.NoteAdapter;
import net.osmtracker.db.DataHelper;
import net.osmtracker.db.NoteListAdapter;
import net.osmtracker.db.TrackContentProvider;
import net.osmtracker.listener.EditNoteDialogOnClickListener;
import net.osmtracker.listener.EditWaypointDialogOnClickListener;

/**
* Activity that lists the previous notes tracked by the user.
*
*/
public class NoteList extends ListActivity {
import java.util.Objects;

public class NoteList extends AppCompatActivity implements NoteAdapter.OnNoteClickListener {

private static final String TAG = NoteList.class.getSimpleName();

private NoteAdapter adapter;
private long trackId;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ListView listView = getListView();
listView.setFitsSystemWindows(true);
listView.setClipToPadding(false);
listView.setPadding(0, 48, 0, 0);
setContentView(R.layout.notelist);

trackId = Objects.requireNonNull(getIntent().getExtras())
.getLong(TrackContentProvider.Schema.COL_TRACK_ID);

registerForContextMenu(listView);
RecyclerView recyclerView = findViewById(R.id.notelist_rv);
recyclerView.setLayoutManager(new LinearLayoutManager(this));

adapter = new NoteAdapter(this);
recyclerView.setAdapter(adapter);
}

@Override
protected void onResume() {
long trackId = getIntent().getExtras().getLong(TrackContentProvider.Schema.COL_TRACK_ID);

Cursor cursor = getContentResolver().query(TrackContentProvider.notesUri(trackId),
null, null, null, TrackContentProvider.Schema.COL_TIMESTAMP + " desc");
startManagingCursor(cursor);
setListAdapter(new NoteListAdapter(NoteList.this, cursor));

super.onResume();
refreshData();
}

@Override
protected void onPause() {
CursorAdapter adapter = (CursorAdapter) getListAdapter();
if (adapter != null) {
// Properly close the adapter cursor
Cursor cursor = adapter.getCursor();
stopManagingCursor(cursor);
cursor.close();
setListAdapter(null);
}
private void refreshData() {

super.onPause();
Cursor cursor = getContentResolver().query(
TrackContentProvider.notesUri(trackId),null, null, null,
TrackContentProvider.Schema.COL_TIMESTAMP + " desc"
);
adapter.swapCursor(cursor);
}

/**
* Handles the selection of a note from the list and opens an edit dialog.
* This dialog allows the user to update the note name (text)
*
* @param l The ListView where the item was clicked.
* @param v The view that was clicked.
* @param position The position of the clicked item.
* @param id The ID of the clicked note.
*/

@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
final Cursor cursor = ((CursorAdapter) getListAdapter()).getCursor();
final DataHelper dataHelper = new DataHelper(l.getContext());
LayoutInflater inflater = this.getLayoutInflater();
public void onNoteClick(long trackId, long noteId, String uuid, String name) {
final DataHelper dataHelper = new DataHelper(this);
LayoutInflater inflater = getLayoutInflater();

// Inflate the note edit dialog layout
final View editNoteDialog = inflater.inflate(R.layout.edit_note_dialog, null);
Expand All @@ -94,127 +75,83 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
Button buttonOSMUpload = editNoteDialog.findViewById(R.id.edit_note_button_osm_upload);
Button buttonCancel = editNoteDialog.findViewById(R.id.edit_note_button_cancel);

// Retrieve existing note name
String oldName = cursor.getString(cursor.getColumnIndex(TrackContentProvider.Schema.COL_NAME));
editNoteName.setText(oldName);
editNoteName.setSelection(oldName.length());

// Retrieve waypoint details
final long trackId = cursor.getLong(cursor.getColumnIndex(TrackContentProvider.Schema.COL_TRACK_ID));
final String uuid = cursor.getString(cursor.getColumnIndex(TrackContentProvider.Schema.COL_UUID));

//TODO Add visual element to represent if the note was uploaded to OSM
// Set existing note name
editNoteName.setText(name);
editNoteName.setSelection(name.length());

AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setCancelable(true);
AlertDialog alert = builder.create();
final AlertDialog alert = builder.create();

// Update note text
buttonUpdate.setOnClickListener(new EditNoteDialogOnClickListener(alert, null) {
@Override
public void onClick(View view) {
String newName = editNoteName.getText().toString();
dataHelper.updateNote(trackId, uuid, newName);
alert.dismiss();
}
buttonUpdate.setOnClickListener(v -> {
String newName = editNoteName.getText().toString();
dataHelper.updateNote(trackId, uuid, newName);
refreshData();
alert.dismiss();
});

// Delete waypoint
buttonDelete.setOnClickListener(new EditNoteDialogOnClickListener(alert, cursor) {
@Override
public void onClick(View view) {
new AlertDialog.Builder(NoteList.this)
.setTitle(getString(R.string.delete_note_confirm_dialog_title))
.setMessage(getString(R.string.delete_note_confirm_dialog_msg))
.setPositiveButton(getString(R.string.delete_note_confirm_bt_ok), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dataHelper.deleteNote(uuid);
cursor.requery();
alert.dismiss();
dialog.dismiss();
}
})
.setNegativeButton(getString(R.string.delete_note_confirm_bt_cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.show();
}
});
// Delete note
buttonDelete.setOnClickListener(v -> new AlertDialog.Builder(this)
.setTitle(R.string.delete_note_confirm_dialog_title)
.setMessage(R.string.delete_note_confirm_dialog_msg)
.setPositiveButton(R.string.delete_note_confirm_bt_ok, (dialog, which) -> {
dataHelper.deleteNote(uuid);
refreshData();
alert.dismiss();
})
.setNegativeButton(R.string.delete_note_confirm_bt_cancel,
(dialog, which) -> dialog.dismiss())
.show());

// Upload note text to OpenStreetMap
buttonOSMUpload.setOnClickListener(new EditNoteDialogOnClickListener(alert, null) {
@Override
public void onClick(View view) {
uploadNoteToOSM(cursor);
}
buttonOSMUpload.setOnClickListener(v -> {
uploadNoteToOSM(noteId);
alert.dismiss();
});

// Cancel button
buttonCancel.setOnClickListener(new EditWaypointDialogOnClickListener(alert, null) {
@Override
public void onClick(View view) {
alert.dismiss();
}
});
buttonCancel.setOnClickListener(v -> alert.dismiss());

alert.setView(editNoteDialog);
alert.show();

super.onListItemClick(l, v, position, id);
}

// Where the menu items get defined
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
getMenuInflater().inflate(R.menu.note_contextmenu, menu);
}

// What happens when a menu item is selected
@Override
public boolean onContextItemSelected(MenuItem item) {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
final Cursor cursor = ((CursorAdapter) getListAdapter()).getCursor();
if (!cursor.moveToPosition(info.position)) return super.onContextItemSelected(item);

// Menu options when you long press on a note
switch (item.getItemId()) {
case R.id.notelist_contextmenu_osm_note_upload:
uploadNoteToOSM(cursor);
return true;
}
return super.onContextItemSelected(item);
}

/**
* Extracts note data from the cursor and launches the OSM Note Upload activity.
* @param cursor The cursor positioned at the selected note.
* Extracts note data from DB and launches the OSM Note Upload activity.
*/
private void uploadNoteToOSM(Cursor cursor) {
long noteId = cursor.getLong(cursor.getColumnIndex(TrackContentProvider.Schema.COL_ID));
String noteText = cursor.getString(cursor.getColumnIndex(TrackContentProvider.Schema.COL_NAME));
double lat = cursor.getDouble(cursor.getColumnIndex(TrackContentProvider.Schema.COL_LATITUDE));
double lon = cursor.getDouble(cursor.getColumnIndex(TrackContentProvider.Schema.COL_LONGITUDE));

Intent intent = new Intent(this, OpenStreetMapNotesUpload.class);
intent.putExtra("noteId", noteId);
intent.putExtra("noteContent", noteText);
intent.putExtra("appName", getString(R.string.app_name));
intent.putExtra("latitude", lat);
intent.putExtra("longitude", lon);

// Retrieve app version number
try {
PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
intent.putExtra("version", pi.versionName);
} catch (PackageManager.NameNotFoundException e) {
// Log error or ignore
}
private void uploadNoteToOSM(long noteId) {
// Query the specific note to get latest Lat/Lon
Cursor cursor = getContentResolver().query(
TrackContentProvider.noteUri(noteId),
null,null,null,null);

if (cursor != null && cursor.moveToFirst()) {
String noteText = cursor.getString(
cursor.getColumnIndexOrThrow(TrackContentProvider.Schema.COL_NAME));
double lat = cursor.getDouble(
cursor.getColumnIndexOrThrow(TrackContentProvider.Schema.COL_LATITUDE));
double lon = cursor.getDouble(
cursor.getColumnIndexOrThrow(TrackContentProvider.Schema.COL_LONGITUDE));

Intent intent = new Intent(this, OpenStreetMapNotesUpload.class);
intent.putExtra("noteId", noteId);
intent.putExtra("noteContent", noteText);
intent.putExtra("appName", getString(R.string.app_name));
intent.putExtra("latitude", lat);
intent.putExtra("longitude", lon);

// Retrieve app version number
try {
PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
intent.putExtra("version", pi.versionName);
} catch (PackageManager.NameNotFoundException e) {
// Ignore
Log.d(TAG, "Package name not found", e);
}

startActivity(intent);
cursor.close();
startActivity(intent);
}
}
}
Loading