Skip to content
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

[FIX] Null check route list #697

Merged
merged 2 commits into from
Apr 2, 2024
Merged

[FIX] Null check route list #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810b673
didn't know that was a risk here. (from play store report)
Mar 9, 2024
291da61
npe fix from console
Apr 1, 2024
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
18 changes: 10 additions & 8 deletions wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/GpxManagementActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,16 @@ private void setupList() {
RecyclerView recyclerView = findViewById(R.id.gpx_list);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
recyclerView.addItemDecoration(new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL));
try {
Cursor cursor = dbHelper.routeMetaIterator();
final DateFormat itemDateFormat = android.text.format.DateFormat.getDateFormat(this.getApplicationContext());
final DateFormat itemTimeFormat = android.text.format.DateFormat.getTimeFormat(this.getApplicationContext());
GpxRecyclerAdapter adapter = new GpxRecyclerAdapter(this, this, cursor, this, this, prefs, itemDateFormat, itemTimeFormat);
recyclerView.setAdapter(adapter);
} catch (DBException dbex) {
Logging.error("Failed to setup list for GPX management: ", dbex);
if (null != dbHelper) {
try {
Cursor cursor = dbHelper.routeMetaIterator();
final DateFormat itemDateFormat = android.text.format.DateFormat.getDateFormat(this.getApplicationContext());
final DateFormat itemTimeFormat = android.text.format.DateFormat.getTimeFormat(this.getApplicationContext());
GpxRecyclerAdapter adapter = new GpxRecyclerAdapter(this, this, cursor, this, this, prefs, itemDateFormat, itemTimeFormat);
recyclerView.setAdapter(adapter);
} catch (DBException dbex) {
Logging.error("Failed to setup list for GPX management: ", dbex);
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/db/DatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,11 @@ public void handleMessage( final Message msg ) {
}

final MainActivity mainActivity = MainActivity.getMainActivity();
final Intent errorReportIntent = new Intent( mainActivity, ErrorReportActivity.class );
errorReportIntent.putExtra( ERROR_REPORT_DIALOG, error );
mainActivity.startActivity( errorReportIntent );
if (null != mainActivity) {
final Intent errorReportIntent = new Intent(mainActivity, ErrorReportActivity.class);
errorReportIntent.putExtra(ERROR_REPORT_DIALOG, error);
mainActivity.startActivity(errorReportIntent);
}
}
}

Expand Down
Loading