diff options
5 files changed, 10 insertions, 10 deletions
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index 0cf30a20..bbeb447b 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -123,10 +123,10 @@ repositories { maven { url "https://dl.bintray.com/lukaville/maven" } //Needed for com.nbsp:library:1.8 in Material File Picker } -final DAGGER_VERSION = '2.32' +final DAGGER_VERSION = '2.33' final ESPRESSO_VERSION = '3.3.0' -final OKHTTP_VERSION = '3.12.10' -final MOCKITO_VERSION = '3.7.7' +final OKHTTP_VERSION = '3.12.13' +final MOCKITO_VERSION = '3.8.0' final RETROFIT_VERSION = '2.6.4' dependencies { @@ -159,7 +159,7 @@ dependencies { implementation 'com.sothree.slidinguppanel:library:3.2.1' - implementation 'org.greenrobot:eventbus:3.1.1' + implementation 'org.greenrobot:eventbus:3.2.0' implementation 'de.greenrobot:greendao:2.0.0' implementation ('de.greenrobot:greendao-generator:2.0.0') { exclude group: 'org.freemarker' @@ -190,7 +190,7 @@ dependencies { implementation 'com.nbsp:library:1.8' // MaterialFilePicker implementation 'androidx.multidex:multidex:2.0.1' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' testImplementation 'junit:junit:4.13.2' testImplementation("org.mockito:mockito-core:$MOCKITO_VERSION") { diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java index f7f00059..36c61463 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java @@ -447,7 +447,7 @@ public class NewsDetailImageDialogFragment extends DialogFragment { //String imagePath = downloadManager.getUriForDownloadedFile(refID).toString(); - String downloadFileLocalUri = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)); + String downloadFileLocalUri = cursor.getString(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_LOCAL_URI)); File image = new File(Uri.parse(downloadFileLocalUri).getPath()); NextcloudNotificationManager.showNotificationDownloadSingleImageComplete(context, image); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java index f93d2e89..2074efe4 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java @@ -36,7 +36,7 @@ import de.luhmer.owncloudnewsreader.helper.StopWatch; import de.luhmer.owncloudnewsreader.interfaces.IPlayPausePodcastClicked; import de.luhmer.owncloudnewsreader.model.CurrentRssViewDataHolder; -public class NewsListRecyclerAdapter extends RecyclerView.Adapter { +public class NewsListRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { private static final String TAG = "NewsListRecyclerAdapter"; private final int VIEW_ITEM = 1; // Item diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml index 3bc036ce..fa9815d2 100644 --- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml +++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml @@ -23,7 +23,7 @@ android:background="?attr/dividerLineColor" /> - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + <RelativeLayout android:layout_marginStart="@dimen/listview_row_margin_left" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -126,7 +126,7 @@ app:tint="?attr/starredColor" android:layout_alignParentEnd="true" android:paddingEnd="@dimen/listview_row_margin_left" - android:contentDescription="@string/content_desc_add_to_favorites"/> + android:contentDescription="@string/content_desc_add_to_favorites" /> <include layout="@layout/subscription_detail_list_item_podcast_wrapper" diff --git a/build.gradle b/build.gradle index ac251552..974ad5e2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' } } |