code fixes

Signed-off-by: Surinder Kumar <[email protected]>

Author: surinder-tsys

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -206,10 +206,6 @@ class FileUploadWorker(
         notificationManager.dismissNotification()
     }
 
-    private fun setWorkerState(user: User?) {
-        WorkerStateObserver.send(WorkerState.FileUploadStarted(user))
-    }
-
     private fun setIdleWorkerState() {
         WorkerStateObserver.send(WorkerState.FileUploadCompleted(currentUploadFileOperation?.file))
     }
@@ -269,7 +265,6 @@ class FileUploadWorker(
                 return@withContext Result.failure()
             }
 
-            setWorkerState(user)
             val operation = createUploadFileOperation(upload, user)
             currentUploadFileOperation = operation
 

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

@@ -91,12 +91,14 @@ class AlbumsPickerActivity :
             captionText = resources.getText(R.string.media_picker_toolbar_title).toString()
         }
 
-        folderPickerBinding.folderPickerBtnCopy.visibility = View.GONE
-        folderPickerBinding.folderPickerBtnMove.visibility = View.GONE
-        folderPickerBinding.folderPickerBtnChoose.visibility = View.GONE
-        folderPickerBinding.folderPickerBtnCancel.visibility = View.GONE
-        folderPickerBinding.chooseButtonSpacer.visibility = View.GONE
-        folderPickerBinding.moveOrCopyButtonSpacer.visibility = View.GONE
+        folderPickerBinding.run {
+            folderPickerBtnCopy.visibility = View.GONE
+            folderPickerBtnMove.visibility = View.GONE
+            folderPickerBtnChoose.visibility = View.GONE
+            folderPickerBtnCancel.visibility = View.GONE
+            chooseButtonSpacer.visibility = View.GONE
+            moveOrCopyButtonSpacer.visibility = View.GONE
+        }
     }
 
     private fun createFragments() {
@@ -114,18 +116,22 @@ class AlbumsPickerActivity :
     }
 
     private fun createGalleryFragment() {
-        val photoFragment = GalleryFragment()
-        val bundle = Bundle()
-        bundle.putParcelable(
-            OCFileListFragment.SEARCH_EVENT,
-            SearchEvent("image/%", SearchRemoteOperation.SearchType.PHOTO_SEARCH)
-        )
-        bundle.putBoolean(EXTRA_FROM_ALBUM, true)
-        photoFragment.arguments = bundle
-
-        val transaction = supportFragmentManager.beginTransaction()
-        transaction.add(R.id.fragment_container, photoFragment, TAG_LIST_OF_FOLDERS)
-        transaction.commit()
+        val bundle = Bundle().apply {
+            putParcelable(
+                OCFileListFragment.SEARCH_EVENT,
+                SearchEvent("image/%", SearchRemoteOperation.SearchType.PHOTO_SEARCH)
+            )
+            putBoolean(EXTRA_FROM_ALBUM, true)
+        }
+
+        val fragment = GalleryFragment().apply {
+            arguments = bundle
+        }
+
+        supportFragmentManager.beginTransaction().run {
+            add(R.id.fragment_container, fragment, TAG_LIST_OF_FOLDERS)
+            commit()
+        }
     }
 
     private val listOfFilesFragment: AlbumsFragment?
@@ -173,21 +179,13 @@ class AlbumsPickerActivity :
         }
     }
 
-    override fun showDetails(file: OCFile?) {
-        // not used at the moment
-    }
+    override fun showDetails(file: OCFile?) = Unit
 
-    override fun showDetails(file: OCFile?, activeTab: Int) {
-        // not used at the moment
-    }
+    override fun showDetails(file: OCFile?, activeTab: Int) = Unit
 
-    override fun onBrowsedDownTo(folder: OCFile?) {
-        // not used at the moment
-    }
+    override fun onBrowsedDownTo(folder: OCFile?) = Unit
 
-    override fun onTransferStateChanged(file: OCFile?, downloading: Boolean, uploading: Boolean) {
-        // not used at the moment
-    }
+    override fun onTransferStateChanged(file: OCFile?, downloading: Boolean, uploading: Boolean) = Unit
 
     companion object {
         private val EXTRA_ACTION = AlbumsPickerActivity::class.java.canonicalName?.plus(".EXTRA_ACTION")
@@ -209,13 +207,9 @@ class AlbumsPickerActivity :
             }
     }
 
-    override fun onRefresh(enforced: Boolean) {
-        // do nothing
-    }
+    override fun onRefresh(enforced: Boolean) = Unit
 
-    override fun onRefresh() {
-        // do nothing
-    }
+    override fun onRefresh() = Unit
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {

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

@@ -519,21 +519,13 @@ class AlbumItemsFragment :
 
     override fun getColumnsCount(): Int = columnSize
 
-    override fun onShareIconClick(file: OCFile?) {
-        // nothing to do here
-    }
+    override fun onShareIconClick(file: OCFile?) = Unit
 
-    override fun showShareDetailView(file: OCFile?) {
-        // nothing to do here
-    }
+    override fun showShareDetailView(file: OCFile?) = Unit
 
-    override fun showActivityDetailView(file: OCFile?) {
-        // nothing to do here
-    }
+    override fun showActivityDetailView(file: OCFile?) = Unit
 
-    override fun onOverflowIconClicked(file: OCFile?, view: View?) {
-        // nothing to do here
-    }
+    override fun onOverflowIconClicked(file: OCFile?, view: View?) = Unit
 
     override fun onItemClicked(file: OCFile) {
         if (adapter?.isMultiSelect() == true) {
@@ -591,9 +583,7 @@ class AlbumItemsFragment :
 
     override fun isLoading(): Boolean = false
 
-    override fun onHeaderClicked() {
-        // nothing to do here
-    }
+    override fun onHeaderClicked() = Unit
 
     fun onAlbumRenamed(newAlbumName: String) {
         albumName = newAlbumName
@@ -930,13 +920,9 @@ class AlbumItemsFragment :
          */
         private val mSelectionWhenActionModeClosedByDrawer: MutableSet<OCFile> = HashSet()
 
-        override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-            // nothing to do
-        }
+        override fun onDrawerSlide(drawerView: View, slideOffset: Float) = Unit
 
-        override fun onDrawerOpened(drawerView: View) {
-            // nothing to do
-        }
+        override fun onDrawerOpened(drawerView: View) = Unit
 
         /**
          * When the navigation drawer is closed, action mode is recovered in the same state as was when the drawer was
@@ -978,9 +964,7 @@ class AlbumItemsFragment :
         /**
          * Update action mode bar when an item is selected / unselected in the list
          */
-        override fun onItemCheckedStateChanged(mode: ActionMode, position: Int, id: Long, checked: Boolean) {
-            // nothing to do here
-        }
+        override fun onItemCheckedStateChanged(mode: ActionMode, position: Int, id: Long, checked: Boolean) = Unit
 
         /**
          * Load menu and customize UI when action mode is started.