refactor(oc-file-list-fragment): kotlin

app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt

@@ -246,7 +246,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
                 sut.supportFragmentManager.executePendingTransactions()
                 val root = sut.storageManager.getFileByEncryptedRemotePath("/")
                 fragment.listDirectory(root, false)
-                fragment.adapter.setShowShareAvatar(true)
+                requireNotNull(fragment.adapter).setShowShareAvatar(true)
             }
 
             val screenShotName = createName(testClassName + "_" + "showSharedFiles", "")
@@ -334,7 +334,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
                 sut.supportFragmentManager.executePendingTransactions()
                 val root = sut.storageManager.getFileByEncryptedRemotePath("/")
                 fragment.listDirectory(root, false)
-                fragment.adapter.setShowShareAvatar(true)
+                requireNotNull(fragment.adapter).setShowShareAvatar(true)
             }
 
             val screenShotName = createName(testClassName + "_" + "showFolderTypes", "")
@@ -399,27 +399,28 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             }
 
             val testFolder: OCFile = activity!!.storageManager.getFileByEncryptedRemotePath("/test/")
+            val adapter = requireNotNull(sut.adapter)
 
             // richWorkspace is not set
-            Assert.assertFalse(sut.adapter.shouldShowHeader())
+            Assert.assertFalse(adapter.shouldShowHeader())
 
             testFolder.richWorkspace = " "
             activity.storageManager.saveFile(testFolder)
-            sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
+            adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
 
-            Assert.assertFalse(sut.adapter.shouldShowHeader())
+            Assert.assertFalse(adapter.shouldShowHeader())
 
             testFolder.richWorkspace = null
             activity.storageManager.saveFile(testFolder)
-            sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
-            Assert.assertFalse(sut.adapter.shouldShowHeader())
+            adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
+            Assert.assertFalse(adapter.shouldShowHeader())
 
             EspressoIdlingResource.increment()
             testFolder.richWorkspace = "1"
             activity.storageManager.saveFile(testFolder)
-            sut.adapter.setCurrentDirectory(testFolder)
+            adapter.setCurrentDirectory(testFolder)
 
-            Assert.assertTrue(sut.adapter.shouldShowHeader())
+            Assert.assertTrue(adapter.shouldShowHeader())
         }
     }
 

app/src/androidTest/java/com/owncloud/android/ui/fragment/SharedListFragmentIT.kt

@@ -170,7 +170,7 @@ internal class SharedListFragmentIT : AbstractIT() {
                         OCShareToOCFileConverter
                             .parseAndSaveShares(listOf(), shares, storageManager, user)
                     }
-                    fragment.adapter.run {
+                    requireNotNull(fragment.adapter).run {
                         prepareForSearchData(SearchType.SHARED_FILTER)
                         updateAdapter(newList, null)
                     }

app/src/main/java/com/nextcloud/utils/extensions/OCFileListFragmentExtensions.kt

@@ -84,7 +84,7 @@ private fun OCFileListFragment.folderFromResult(bundle: Bundle): OCFile? {
         return null
     }
 
-    val file = containerActivity.storageManager.getFileByEncryptedRemotePath(remotePath)
+    val file = requireContainerActivity().storageManager.getFileByEncryptedRemotePath(remotePath)
     if (file == null) {
         Log_OC.e(TAG, "file is null, cannot continue encryption action")
     }

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -674,7 +674,7 @@ class FileDisplayActivity :
 
             ON_DEVICE == action -> {
                 refreshOrInitOCFileListFragment()
-                listOfFilesFragment?.setCurrentSearchType(SearchType.ON_DEVICE)
+                listOfFilesFragment?.currentSearchType = SearchType.ON_DEVICE
                 updateActionBarTitleAndHomeButton(null)
             }
         }
@@ -735,7 +735,7 @@ class FileDisplayActivity :
         }
 
         listOfFilesFragment?.isSearchFragment = true
-        listOfFilesFragment?.setCurrentSearchType(searchEvent)
+        listOfFilesFragment?.updateSearchType(searchEvent)
     }
     // endregion
 
@@ -833,7 +833,7 @@ class FileDisplayActivity :
         getOCFileListFragmentFromFile(object : TransactionInterface {
             override fun onOCFileListFragmentComplete(fragment: OCFileListFragment) {
                 browseUp(fragment)
-                fragment.onOverflowIconClicked(file, null)
+                file?.let { fragment.onOverflowIconClicked(it, null) }
             }
         })
     }
@@ -1462,7 +1462,7 @@ class FileDisplayActivity :
         folderRefreshScheduler.start()
 
         if (ocFileListFragment?.isSearchFragment == true) {
-            ocFileListFragment?.setSearchArgs(ocFileListFragment?.arguments)
+            ocFileListFragment?.loadSearchState(ocFileListFragment?.arguments)
         }
         if (isAlbumsFragment || isAlbumItemsFragment) {
             highlightNavigationViewItem(R.id.nav_album)
@@ -2469,7 +2469,7 @@ class FileDisplayActivity :
             // OCFileSearchTask may still run during rename, so use a single refresh path to avoid
             // flicker/inconsistent filenames.
             if (fragment?.isSearchFragment == true) {
-                fragment.cancelAndRetriggerSearch()
+                fragment.restartSearch()
             } else {
                 fragment?.adapter?.updateFile(renamedFile)
             }
@@ -2533,7 +2533,9 @@ class FileDisplayActivity :
                 return
             }
 
-            fileListFragment?.onItemClicked(storageManager.getFileByDecryptedRemotePath(operation.getRemotePath()))
+            storageManager.getFileByDecryptedRemotePath(operation.getRemotePath())?.let {
+                fileListFragment?.onItemClicked(it)
+            }
         } else {
             try {
                 if (RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS == result.code) {
@@ -2970,7 +2972,7 @@ class FileDisplayActivity :
             this.leftFragment = SharedListFragment()
         }
 
-        listOfFilesFragment?.setCurrentSearchType(event)
+        listOfFilesFragment?.updateSearchType(event)
         updateActionBarTitleAndHomeButton(null)
     }
 

app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -534,7 +534,7 @@ open class FolderPickerActivity :
             return
         }
 
-        listOfFilesFragment?.onMessageEvent(
+        listOfFilesFragment?.onSearchEvent(
             SearchEvent(
                 query,
                 SearchRemoteOperation.SearchType.FILE_SEARCH

app/src/main/java/com/owncloud/android/ui/fragment/EncryptedFolderClickHandler.kt

@@ -117,7 +117,8 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) {
     fun openAfterKeySetup(file: OCFile) {
         fragment.lifecycleScope.launch {
             if (fragment.e2eeActionResolver.checkFolderMetadataKey(file)) {
-                onEncryptionSetupComplete(file, fragment.adapter.getItemPosition(file))
+                val position = fragment.adapter?.getItemPosition(file) ?: return@launch
+                onEncryptionSetupComplete(file, position)
             } else {
                 SnackbarUtil.show(fragment, R.string.encryption_open_key_mismatch)
             }
@@ -131,7 +132,7 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) {
 
     private fun onFolderKeyVerified(file: OCFile, position: Int, fileActivity: FileActivity) {
         val user = fileActivity.user.orElseThrow { RuntimeException() }
-        val capability = fragment.containerActivity.getStorageManager().getCapability(user.accountName)
+        val capability = fragment.requireContainerActivity().storageManager.getCapability(user.accountName)
 
         if (capability.endToEndEncryption.isFalse || capability.endToEndEncryption.isUnknown) {
             SnackbarUtil.show(fragment, R.string.end_to_end_encryption_not_enabled)
@@ -146,8 +147,8 @@ class EncryptedFolderClickHandler(private val fragment: OCFileListFragment) {
     }
 
     private fun onEncryptionSetupComplete(file: OCFile?, position: Int) {
-        fragment.searchFragment = false
-        fragment.mHideFab = false
+        fragment.isSearchFragment = false
+        fragment.hideFab = false
 
         val folderPickerActivity = fragment.containerActivity as? FolderPickerActivity
         if (folderPickerActivity?.isDoNotEnterEncryptedFolder == true) {

app/src/main/java/com/owncloud/android/ui/fragment/FileListLayoutManager.kt

@@ -24,11 +24,11 @@ class FileListLayoutManager(private val fragment: OCFileListFragment, private va
     fun sortFiles(sortOrder: FileSortOrder?) {
         sortOrder ?: return
         fragment.mSortButton?.setText(SortOrderUi.labelRes(sortOrder))
-        fragment.mAdapter.setSortOrder(fragment.mFile, sortOrder)
+        fragment.adapter?.setSortOrder(fragment.currentFile, sortOrder)
     }
 
     fun isGridViewPreferred(): Boolean {
-        val layout = FolderLayout.get(fragment.mFile, fragment.currentSearchType)
+        val layout = FolderLayout.get(fragment.currentFile, fragment.currentSearchType)
         return preferences.getFolderLayout(layout) == OCFileListFragment.FOLDER_LAYOUT_GRID
     }
 
@@ -45,7 +45,7 @@ class FileListLayoutManager(private val fragment: OCFileListFragment, private va
     }
 
     fun setListAsPreferred() {
-        val layout = FolderLayout.get(fragment.mFile, fragment.currentSearchType)
+        val layout = FolderLayout.get(fragment.currentFile, fragment.currentSearchType)
         preferences.setFolderLayout(layout, OCFileListFragment.FOLDER_LAYOUT_LIST)
         switchToListView()
     }
@@ -57,7 +57,7 @@ class FileListLayoutManager(private val fragment: OCFileListFragment, private va
     }
 
     fun setGridAsPreferred() {
-        val layout = FolderLayout.get(fragment.mFile, fragment.currentSearchType)
+        val layout = FolderLayout.get(fragment.currentFile, fragment.currentSearchType)
         preferences.setFolderLayout(layout, OCFileListFragment.FOLDER_LAYOUT_GRID)
         switchToGridView()
     }
@@ -90,8 +90,8 @@ class FileListLayoutManager(private val fragment: OCFileListFragment, private va
         if (grid) {
             layoutManager = GridLayoutManager(context, fragment.columnsCount)
             layoutManager.spanSizeLookup = object : SpanSizeLookup() {
-                override fun getSpanSize(position: Int): Int = if (position == fragment.adapter.itemCount - 1 ||
-                    (position == 0 && fragment.adapter.isHeaderDisplayed)
+                override fun getSpanSize(position: Int): Int = if (position == adapter.itemCount - 1 ||
+                    (position == 0 && adapter.isHeaderDisplayed)
                 ) {
                     layoutManager.spanCount
                 } else {

app/src/main/java/com/owncloud/android/ui/fragment/FolderEncryption.kt

@@ -35,7 +35,7 @@ class FolderEncryption(private val fragment: OCFileListFragment) {
         val shouldBeEncrypted = event.shouldBeEncrypted
 
         try {
-            val storageManager = fragment.containerActivity.storageManager
+            val storageManager = fragment.requireContainerActivity().storageManager
             val folder = storageManager.getFileByRemoteId(remoteId) ?: run {
                 Log_OC.e(TAG, "folder is null, cannot encrypt")
                 return@withContext false
@@ -45,7 +45,10 @@ class FolderEncryption(private val fragment: OCFileListFragment) {
             val provider = fragment.arbitraryDataProvider
             val publicKey = provider.getValue(user, EncryptionUtils.PUBLIC_KEY)
             val privateKey = provider.getValue(user, EncryptionUtils.PRIVATE_KEY)
-            val client = fragment.clientFactory.create(user)
+            val client = fragment.clientRepository.getOwncloudClient() ?: run {
+                Log_OC.e(TAG, "client is not available, cannot toggle encryption of $remotePath")
+                return@withContext false
+            }
 
             val result = ToggleEncryptionRemoteOperation(localId, remotePath, shouldBeEncrypted)
                 .execute(client)
@@ -101,13 +104,13 @@ class FolderEncryption(private val fragment: OCFileListFragment) {
             )
 
         withContext(Dispatchers.Main) {
-            val isFileExists = (fragment.adapter.getFileByRemoteId(remoteId) != null)
-            if (!isFileExists) {
-                val newFile = storageManager.getFileByRemoteId(remoteId)
-                fragment.adapter.insertFile(newFile)
-            }
+            fragment.adapter?.run {
+                if (getFileByRemoteId(remoteId) == null) {
+                    insertFile(storageManager.getFileByRemoteId(remoteId))
+                }
 
-            fragment.adapter.updateFileEncryptionById(remoteId, shouldBeEncrypted)
+                updateFileEncryptionById(remoteId, shouldBeEncrypted)
+            }
         }
 
         return result