From eac7efba6421f2d672c79b86ffe3c5bdd8269ca4 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 26 Feb 2021 21:29:36 +0100 Subject: [PATCH] Upgrade desugar lib. --- build.gradle | 2 +- .../opentracks/adapters/MarkerResourceCursorAdapter.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dc92ea0aa..f274ebafa 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ android { dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.preference:preference:1.1.1' diff --git a/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java index c535e5c82..c6dbf3b45 100644 --- a/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java @@ -33,7 +33,8 @@ public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implement private final Activity activity; - private ExecutorListViewService executorService = new ExecutorListViewService(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT); + //TODO Should be Marker.Id + private final ExecutorListViewService executorService = new ExecutorListViewService(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT); private boolean scroll = false; @@ -111,8 +112,8 @@ public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implement return; } - long id = cursor.getLong(cursor.getColumnIndex(MarkerColumns._ID)); - String photoUrl = cursor.getString(cursor.getColumnIndex(MarkerColumns.PHOTOURL)); + long id = cursor.getLong(cursor.getColumnIndexOrThrow(MarkerColumns._ID)); + String photoUrl = cursor.getString(cursor.getColumnIndexOrThrow(MarkerColumns.PHOTOURL)); boolean hasPhoto = photoUrl != null && !photoUrl.equals(""); if (hasPhoto) {