From 2e51954bed0e44277e61d347b7266fb611d8a5c8 Mon Sep 17 00:00:00 2001 From: davigonz Date: Thu, 21 Mar 2019 12:44:10 +0100 Subject: [PATCH] Apply changes requested --- build.gradle | 2 +- .../java/com/owncloud/android/NetworkBoundResource.kt | 2 +- .../shares/ui/fragment/PublicShareDialogFragment.kt | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index c228ef4466ac..48c0c9c77e27 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { // Libraries - kotlinVersion = '1.3.11' + kotlinVersion = '1.3.21' archLifecycleVersion = '2.0.0' roomVersion = '2.0.0' diff --git a/owncloudApp/src/main/java/com/owncloud/android/NetworkBoundResource.kt b/owncloudApp/src/main/java/com/owncloud/android/NetworkBoundResource.kt index 45d031c53e58..32380b7fd284 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/NetworkBoundResource.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/NetworkBoundResource.kt @@ -46,7 +46,7 @@ abstract class NetworkBoundResource( private val appExecutors: AppExecutors ) { /** - * Result will observe three different livedata objects and react on change events from them + * A generic class that can provide a resource backed by both the sqlite database and the network. * - Shares livedata from Room to detect changes in database * - Errors livedata from remote operations * - Loading status diff --git a/owncloudApp/src/main/java/com/owncloud/android/shares/ui/fragment/PublicShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/shares/ui/fragment/PublicShareDialogFragment.kt index 9e404f3aee69..5a446ac06983 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/shares/ui/fragment/PublicShareDialogFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/shares/ui/fragment/PublicShareDialogFragment.kt @@ -354,14 +354,6 @@ class PublicShareDialogFragment : DialogFragment() { } } ) -// (activity as FileActivity).fileOperationsHelper.shareFileViaLink( -// file, -// publicLinkName, -// publicLinkPassword, -// publicLinkExpirationDateInMillis, -// false, -// publicLinkPermissions) - } else { // Updating an existing public share if (!passwordSwitch!!.isChecked) { publicLinkPassword = ""