From 71dd4679adf3bd6c6129102a961268fa64489d96 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 5 Mar 2020 07:40:07 +0100 Subject: [PATCH 1/4] Update libs --- build.gradle | 12 ++++++------ owncloudApp/build.gradle | 6 +++--- owncloudTestUtil/build.gradle | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index dc2b00efca1..53f74c58bca 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,10 @@ buildscript { // Android jetpack archLifecycleVersion = "2.1.0" - roomVersion = "2.2.2" + roomVersion = "2.2.4" appCompat = "1.1.0" - sqliteVersion = "2.0.1" - lifecycleLiveData = "2.0.0" + sqliteVersion = "2.1.0" + lifecycleLiveData = "2.2.0" biometricVersion="1.0.1" // Kotlin @@ -35,9 +35,9 @@ buildscript { ktxVersion = "1.1.0" // KTX extensions - ktxCoreVersion = "1.1.0" - ktxViewModelVersion = "2.2.0-alpha01" - ktxFragmentVersion = "1.0.0" + ktxCoreVersion = "1.2.0" + ktxViewModelVersion = "2.2.0" + ktxFragmentVersion = "1.2.2" ktxLiveData = "2.1.0" } diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 09fc1907c96..b08bad9dd3b 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -15,7 +15,7 @@ dependencies { // Dependencies for app building implementation "androidx.legacy:legacy-support-v4:$androidX" implementation "androidx.annotation:annotation:1.1.0" - implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.material:material:1.1.0' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'com.google.android.exoplayer:exoplayer:r2.2.0' implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' @@ -53,7 +53,7 @@ dependencies { exclude module: 'objenesis' } androidTestImplementation 'com.github.tmurakami:dexopener:2.0.4' - androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test:runner:1.2.0' // Image loading implementation('com.github.bumptech.glide:glide:4.6.1') { @@ -66,7 +66,7 @@ dependencies { implementation "androidx.multidex:multidex:2.0.1" // Convert Java Objects into JSON and back - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" diff --git a/owncloudTestUtil/build.gradle b/owncloudTestUtil/build.gradle index ee9357a7598..9514f8b6347 100644 --- a/owncloudTestUtil/build.gradle +++ b/owncloudTestUtil/build.gradle @@ -18,7 +18,6 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':owncloudDomain') implementation project(':owncloud-android-library:owncloudComLibrary') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" From aad190acbc105d618af61180d9f3a4f80ddf6662 Mon Sep 17 00:00:00 2001 From: agarcia Date: Mon, 4 May 2020 12:33:31 +0200 Subject: [PATCH 2/4] Update some libs --- build.gradle | 4 ++-- owncloudApp/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 53f74c58bca..f20f2cc7284 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { // Android jetpack archLifecycleVersion = "2.1.0" - roomVersion = "2.2.4" + roomVersion = "2.2.5" appCompat = "1.1.0" sqliteVersion = "2.1.0" lifecycleLiveData = "2.2.0" @@ -37,7 +37,7 @@ buildscript { // KTX extensions ktxCoreVersion = "1.2.0" ktxViewModelVersion = "2.2.0" - ktxFragmentVersion = "1.2.2" + ktxFragmentVersion = "1.2.4" ktxLiveData = "2.1.0" } diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index b08bad9dd3b..01eb312bac0 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -70,7 +70,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$archLifecycleVersion" kapt "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion" From 4ffcbfd1a8331d7fbdbe5563855d0fa4f29b3693 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 6 Mar 2020 07:50:00 +0100 Subject: [PATCH 3/4] fix lint errors --- owncloud-android-library | 2 +- .../fragments/PublicShareDialogFragment.kt | 2 +- .../fragments/SearchShareesFragment.kt | 4 +- .../ui/sharing/fragments/ShareFileFragment.kt | 20 +++++----- .../ui/dialog/CreateFolderDialogFragment.java | 39 ++++++++++--------- .../ui/dialog/RemoveShareDialogFragment.kt | 8 ++-- 6 files changed, 39 insertions(+), 36 deletions(-) diff --git a/owncloud-android-library b/owncloud-android-library index 1cee1a7a65e..8708af1cfd3 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 1cee1a7a65e794e69d1e5d4eff8f556a3a14c945 +Subproject commit 8708af1cfd308003511037f5e02065a78b3a91c1 diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt index 3cd53e70daf..9a417eaa42f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt @@ -235,7 +235,7 @@ class PublicShareDialogFragment : DialogFragment() { val publicLinkExpirationDateInMillis = expirationDateValueInMillis val publicLinkPermissions: Int - var publicUploadPermission: Boolean + val publicUploadPermission: Boolean when (shareViaLinkEditPermissionGroup?.checkedRadioButtonId) { R.id.shareViaLinkEditPermissionUploadFiles -> { diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt index 3e0d1094fcf..b4790334a89 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt @@ -172,7 +172,7 @@ class SearchShareesFragment : Fragment(), ) // Show data - val usersList = view!!.findViewById(R.id.searchUsersListView) + val usersList = requireView().findViewById(R.id.searchUsersListView) if (privateShares.isNotEmpty()) { usersList.visibility = View.VISIBLE @@ -194,7 +194,7 @@ class SearchShareesFragment : Fragment(), override fun onStart() { super.onStart() // focus the search view and request the software keyboard be shown - val searchView = view!!.findViewById(R.id.searchView) + val searchView = requireView().findViewById(R.id.searchView) if (searchView.requestFocus()) { val imm = requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager imm.showSoftInput(searchView.findFocus(), InputMethodManager.SHOW_IMPLICIT) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt index a5da88a60d1..9e928d3f3c6 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt @@ -195,9 +195,9 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) Timber.d("onCreate") - if (arguments != null) { - file = arguments!!.getParcelable(ARG_FILE) - account = arguments!!.getParcelable(ARG_ACCOUNT) + arguments?.let { + file = it.getParcelable(ARG_FILE) + account = it.getParcelable(ARG_ACCOUNT) } } @@ -276,7 +276,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe super.onActivityCreated(savedInstanceState) Timber.d("onActivityCreated") - activity!!.setTitle(R.string.share_dialog_title) + activity?.setTitle(R.string.share_dialog_title) observeCapabilities() // Get capabilities to update some UI elements depending on them observeShares() @@ -287,7 +287,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe try { listener = context as ShareFragmentListener? } catch (e: ClassCastException) { - throw ClassCastException(activity!!.toString() + " must implement OnShareFragmentInteractionListener") + throw ClassCastException(activity.toString() + " must implement OnShareFragmentInteractionListener") } } @@ -413,7 +413,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe // Update list of users/groups // TODO Refactoring: create a new {@link ShareUserListAdapter} instance with every call should not be needed userGroupsAdapter = ShareUserListAdapter( - context!!, + requireContext(), R.layout.share_user_item, privateShares, this @@ -480,7 +480,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe */ private fun updateListOfPublicLinks() { publicLinksAdapter = SharePublicLinkListAdapter( - context!!, + requireContext(), R.layout.share_public_link_item, publicLinks, this @@ -530,9 +530,9 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe * */ private fun hideSectionsDisabledInBuildTime(view: View) { - val shareViaLinkAllowed = activity!!.resources.getBoolean(R.bool.share_via_link_feature) - val shareWithUsersAllowed = activity!!.resources.getBoolean(R.bool.share_with_users_feature) - val shareWarningAllowed = activity!!.resources.getBoolean(R.bool.warning_sharing_public_link) + val shareViaLinkAllowed = requireActivity().resources.getBoolean(R.bool.share_via_link_feature) + val shareWithUsersAllowed = requireActivity().resources.getBoolean(R.bool.share_with_users_feature) + val shareWarningAllowed = requireActivity().resources.getBoolean(R.bool.warning_sharing_public_link) // Hide share via link section if it is not enabled if (!shareViaLinkAllowed) { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java index 47ceffabc10..0b9d12f37f7 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java @@ -1,4 +1,4 @@ -/** +/* * ownCloud Android client application * * @author David A. Velasco @@ -9,18 +9,19 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. - * + *

* This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + *

* You should have received a copy of the GNU General Public License * along with this program. If not, see . */ package com.owncloud.android.ui.dialog; +import android.annotation.SuppressLint; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; @@ -30,6 +31,7 @@ import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.DialogFragment; @@ -41,12 +43,11 @@ import com.owncloud.android.utils.PreferenceUtils; /** - * Dialog to input the name for a new folder to create. - * - * Triggers the folder creation when name is confirmed. + * Dialog to input the name for a new folder to create. + *

+ * Triggers the folder creation when name is confirmed. */ -public class CreateFolderDialogFragment - extends DialogFragment implements DialogInterface.OnClickListener { +public class CreateFolderDialogFragment extends DialogFragment implements DialogInterface.OnClickListener { private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER"; @@ -55,7 +56,7 @@ public class CreateFolderDialogFragment /** * Public factory method to create new CreateFolderDialogFragment instances. * - * @param parentFolder Folder to create + * @param parentFolder Folder to create * @return Dialog ready to show. */ public static CreateFolderDialogFragment newInstance(OCFile parentFolder) { @@ -68,12 +69,14 @@ public static CreateFolderDialogFragment newInstance(OCFile parentFolder) { private OCFile mParentFolder; + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - mParentFolder = getArguments().getParcelable(ARG_PARENT_FOLDER); + mParentFolder = requireArguments().getParcelable(ARG_PARENT_FOLDER); // Inflate the layout for the dialog - LayoutInflater inflater = getActivity().getLayoutInflater(); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.edit_box_dialog, null); // Allow or disallow touches with other visible windows @@ -81,7 +84,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(getContext()) ); - CoordinatorLayout coordinatorLayout = getActivity().findViewById(R.id.coordinator_layout); + CoordinatorLayout coordinatorLayout = requireActivity().findViewById(R.id.coordinator_layout); coordinatorLayout.setFilterTouchesWhenObscured( PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(getContext()) @@ -93,7 +96,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { inputText.requestFocus(); // Build the dialog - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()); builder.setView(v) .setPositiveButton(android.R.string.ok, this) .setNegativeButton(android.R.string.cancel, this) @@ -107,8 +110,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { public void onClick(DialogInterface dialog, int which) { if (which == AlertDialog.BUTTON_POSITIVE) { String newFolderName = - ((TextView) (getDialog().findViewById(R.id.user_input))) - .getText().toString().trim(); + ((TextView) (requireDialog().findViewById(R.id.user_input))).getText().toString().trim(); if (newFolderName.length() <= 0) { showSnackMessage(R.string.filename_empty); @@ -122,19 +124,18 @@ public void onClick(DialogInterface dialog, int which) { String path = mParentFolder.getRemotePath(); path += newFolderName + OCFile.PATH_SEPARATOR; - ((ComponentsGetter) getActivity()). - getFileOperationsHelper().createFolder(path, false); + ((ComponentsGetter) requireActivity()).getFileOperationsHelper().createFolder(path, false); } } /** * Show a temporary message in a Snackbar bound to the content view of the parent Activity * - * @param messageResource Message to show. + * @param messageResource Message to show. */ private void showSnackMessage(int messageResource) { Snackbar snackbar = Snackbar.make( - getActivity().findViewById(R.id.coordinator_layout), + requireActivity().findViewById(R.id.coordinator_layout), messageResource, Snackbar.LENGTH_LONG ); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt index 47c68bb7868..2aa826d0f4a 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt @@ -50,8 +50,10 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val dialog = super.onCreateDialog(savedInstanceState) - targetShare = arguments!!.getParcelable(ARG_TARGET_SHARE) - account = arguments!!.getParcelable(ARG_ACCOUNT) + arguments?.let { + targetShare = it.getParcelable(ARG_TARGET_SHARE) + account = it.getParcelable(ARG_ACCOUNT) + } setOnConfirmationListener(this) @@ -63,7 +65,7 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial try { listener = activity as ShareFragmentListener? } catch (e: IllegalStateException) { - throw IllegalStateException(activity!!.toString() + " must implement OnShareFragmentInteractionListener") + throw IllegalStateException(activity.toString() + " must implement OnShareFragmentInteractionListener") } } From 8344a73f2ce859e67df93f813d26186cf727a49e Mon Sep 17 00:00:00 2001 From: agarcia Date: Tue, 2 Jun 2020 08:58:07 +0200 Subject: [PATCH 4/4] Fix lint errors --- build.gradle | 2 +- owncloudApp/build.gradle | 2 +- .../ui/sharing/fragments/EditPrivateShareFragment.kt | 2 +- .../ui/sharing/fragments/PublicShareDialogFragment.kt | 4 ++-- .../ui/sharing/fragments/SearchShareesFragment.kt | 2 +- .../presentation/ui/sharing/fragments/ShareFileFragment.kt | 4 ++-- .../owncloud/android/ui/dialog/RemoveShareDialogFragment.kt | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index f20f2cc7284..32405e406c9 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ buildscript { ktxVersion = "1.1.0" // KTX extensions - ktxCoreVersion = "1.2.0" + ktxCoreVersion = "1.3.0" ktxViewModelVersion = "2.2.0" ktxFragmentVersion = "1.2.4" ktxLiveData = "2.1.0" diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 01eb312bac0..80255d7b61f 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -15,7 +15,7 @@ dependencies { // Dependencies for app building implementation "androidx.legacy:legacy-support-v4:$androidX" implementation "androidx.annotation:annotation:1.1.0" - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'com.google.android.exoplayer:exoplayer:r2.2.0' implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt index 8561b64479e..66bfb044e6b 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt @@ -135,7 +135,7 @@ class EditPrivateShareFragment : DialogFragment() { try { listener = activity as ShareFragmentListener? } catch (e: IllegalStateException) { - throw IllegalStateException(activity!!.toString() + " must implement OnShareFragmentInteractionListener") + throw IllegalStateException(requireActivity().toString() + " must implement OnShareFragmentInteractionListener") } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt index 9a417eaa42f..e4f05349578 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt @@ -569,7 +569,7 @@ class PublicShareDialogFragment : DialogFragment() { ) dialog.setDatePickerListener(this) dialog.show( - activity!!.supportFragmentManager, + requireActivity().supportFragmentManager, ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG ) } else { @@ -593,7 +593,7 @@ class PublicShareDialogFragment : DialogFragment() { ) dialog.setDatePickerListener(this) dialog.show( - activity!!.supportFragmentManager, + requireActivity().supportFragmentManager, ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG ) } diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt index b4790334a89..10a5f4269c1 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt @@ -145,7 +145,7 @@ class SearchShareesFragment : Fragment(), private fun observePrivateShares() { ocShareViewModel.shares.observe( - this, + viewLifecycleOwner, Event.EventObserver { uiResult -> val privateShares = uiResult.getStoredData()?.filter { share -> share.shareType == ShareType.USER || diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt index 9e928d3f3c6..d5a261cf86e 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt @@ -298,7 +298,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe private fun observeCapabilities() { ocCapabilityViewModel.capabilities.observe( - this, + viewLifecycleOwner, Observer { event -> val uiResult = event.peekContent() val capabilities = uiResult.getStoredData() @@ -331,7 +331,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe private fun observeShares() { ocShareViewModel.shares.observe( - this, + viewLifecycleOwner, Observer { event -> val uiResult = event.peekContent() val shares = uiResult.getStoredData() diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt index 2aa826d0f4a..a1837b14116 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt @@ -65,7 +65,7 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial try { listener = activity as ShareFragmentListener? } catch (e: IllegalStateException) { - throw IllegalStateException(activity.toString() + " must implement OnShareFragmentInteractionListener") + throw IllegalStateException(requireActivity().toString() + " must implement OnShareFragmentInteractionListener") } }