mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 17:46:37 +03:00
Merge pull request #12332 from nextcloud/refactor/folder-picker-activity
Refactor Folder Picker Activity
This commit is contained in:
Jonas Mayer
GitHub
commit
4bd0943efa
1 changed files with 259 additions and 231 deletions
|
|
@ -34,9 +34,10 @@ import android.view.MenuItem
|
|||
import android.view.View
|
||||
import androidx.activity.OnBackPressedCallback
|
||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||
import com.google.android.material.button.MaterialButton
|
||||
import com.nextcloud.client.di.Injectable
|
||||
import com.owncloud.android.R
|
||||
import com.owncloud.android.databinding.FilesFolderPickerBinding
|
||||
import com.owncloud.android.databinding.FilesPickerBinding
|
||||
import com.owncloud.android.datamodel.OCFile
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperation
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||
|
|
@ -60,11 +61,10 @@ import com.owncloud.android.utils.PathUtils
|
|||
import java.io.File
|
||||
import javax.inject.Inject
|
||||
|
||||
@Suppress("Detekt.TooManyFunctions") // legacy code
|
||||
@Suppress("Detekt.TooManyFunctions")
|
||||
open class FolderPickerActivity :
|
||||
FileActivity(),
|
||||
FileFragment.ContainerActivity,
|
||||
View.OnClickListener,
|
||||
OnEnforceableRefreshListener,
|
||||
Injectable,
|
||||
OnSortingOrderListener {
|
||||
|
|
@ -75,76 +75,83 @@ open class FolderPickerActivity :
|
|||
var isDoNotEnterEncryptedFolder = false
|
||||
private set
|
||||
|
||||
private var mCancelBtn: MaterialButton? = null
|
||||
private var mCopyBtn: MaterialButton? = null
|
||||
private var mChooseBtn: MaterialButton? = null
|
||||
private var mMoveBtn: MaterialButton? = null
|
||||
private var captionText: String? = null
|
||||
|
||||
private var caption: String? = null
|
||||
private var action: String? = null
|
||||
private var targetFilePaths: ArrayList<String>? = null
|
||||
|
||||
private var mAction: String? = null
|
||||
private var mTargetFilePaths: ArrayList<String>? = null
|
||||
private lateinit var filesPickerBinding: FilesPickerBinding
|
||||
private lateinit var folderPickerBinding: FilesFolderPickerBinding
|
||||
|
||||
@Inject
|
||||
lateinit var localBroadcastManager: LocalBroadcastManager
|
||||
|
||||
private fun initBinding() {
|
||||
if (this is FilePickerActivity) {
|
||||
filesPickerBinding = FilesPickerBinding.inflate(layoutInflater)
|
||||
setContentView(filesPickerBinding.root)
|
||||
} else {
|
||||
folderPickerBinding = FilesFolderPickerBinding.inflate(layoutInflater)
|
||||
setContentView(folderPickerBinding.root)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
Log_OC.d(TAG, "onCreate() start")
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
if (this is FilePickerActivity) {
|
||||
setContentView(R.layout.files_picker)
|
||||
} else {
|
||||
setContentView(R.layout.files_folder_picker)
|
||||
}
|
||||
|
||||
// sets callback listeners for UI elements
|
||||
initBinding()
|
||||
initControls()
|
||||
|
||||
// Action bar setup
|
||||
setupToolbar()
|
||||
findViewById<View>(R.id.sort_list_button_group).visibility =
|
||||
View.VISIBLE
|
||||
findViewById<View>(R.id.switch_grid_view_button).visibility =
|
||||
View.GONE
|
||||
mAction = intent.getStringExtra(EXTRA_ACTION)
|
||||
|
||||
if (mAction != null && mAction == CHOOSE_LOCATION) {
|
||||
setupUIForChooseButton()
|
||||
} else {
|
||||
caption = themeUtils.getDefaultDisplayNameForRootFolder(this)
|
||||
}
|
||||
|
||||
mTargetFilePaths = intent.getStringArrayListExtra(EXTRA_FILE_PATHS)
|
||||
setupActionBar()
|
||||
setupAction()
|
||||
initTargetFilesPath()
|
||||
|
||||
if (savedInstanceState == null) {
|
||||
createFragments()
|
||||
}
|
||||
updateActionBarTitleAndHomeButtonByString(caption)
|
||||
|
||||
// always AFTER setContentView(...) ; to work around bug in its implementation
|
||||
|
||||
// sets message for empty list of folders
|
||||
updateActionBarTitleAndHomeButtonByString(captionText)
|
||||
setBackgroundText()
|
||||
handleOnBackPressed()
|
||||
}
|
||||
|
||||
Log_OC.d(TAG, "onCreate() end")
|
||||
private fun setupActionBar() {
|
||||
findViewById<View>(R.id.sort_list_button_group).visibility =
|
||||
View.VISIBLE
|
||||
findViewById<View>(R.id.switch_grid_view_button).visibility =
|
||||
View.GONE
|
||||
}
|
||||
|
||||
private fun setupAction() {
|
||||
action = intent.getStringExtra(EXTRA_ACTION)
|
||||
|
||||
if (action != null && action == CHOOSE_LOCATION) {
|
||||
setupUIForChooseButton()
|
||||
} else {
|
||||
captionText = themeUtils.getDefaultDisplayNameForRootFolder(this)
|
||||
}
|
||||
}
|
||||
|
||||
private fun initTargetFilesPath() {
|
||||
targetFilePaths = intent.getStringArrayListExtra(EXTRA_FILE_PATHS)
|
||||
}
|
||||
|
||||
private fun setupUIForChooseButton() {
|
||||
caption = resources.getText(R.string.folder_picker_choose_caption_text).toString()
|
||||
captionText = resources.getText(R.string.folder_picker_choose_caption_text).toString()
|
||||
mSearchOnlyFolders = true
|
||||
isDoNotEnterEncryptedFolder = true
|
||||
|
||||
mCopyBtn?.visibility = View.GONE
|
||||
mMoveBtn?.visibility = View.GONE
|
||||
mChooseBtn?.visibility = View.VISIBLE
|
||||
|
||||
val chooseButtonSpacer = findViewById<View>(R.id.choose_button_spacer)
|
||||
val moveOrCopyButtonSpacer = findViewById<View>(R.id.move_or_copy_button_spacer)
|
||||
|
||||
chooseButtonSpacer.visibility = View.VISIBLE
|
||||
moveOrCopyButtonSpacer.visibility = View.GONE
|
||||
if (this is FilePickerActivity) {
|
||||
return
|
||||
} else {
|
||||
folderPickerBinding.folderPickerBtnCopy.visibility = View.GONE
|
||||
folderPickerBinding.folderPickerBtnMove.visibility = View.GONE
|
||||
folderPickerBinding.folderPickerBtnChoose.visibility = View.VISIBLE
|
||||
folderPickerBinding.chooseButtonSpacer.visibility = View.VISIBLE
|
||||
folderPickerBinding.moveOrCopyButtonSpacer.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleOnBackPressed() {
|
||||
|
|
@ -152,15 +159,15 @@ open class FolderPickerActivity :
|
|||
this,
|
||||
object : OnBackPressedCallback(true) {
|
||||
override fun handleOnBackPressed() {
|
||||
val listOfFiles = listOfFilesFragment
|
||||
if (listOfFiles != null) {
|
||||
// should never be null, indeed
|
||||
val levelsUp = listOfFiles.onBrowseUp()
|
||||
listOfFilesFragment?.let {
|
||||
val levelsUp = it.onBrowseUp()
|
||||
|
||||
if (levelsUp == 0) {
|
||||
finish()
|
||||
return
|
||||
}
|
||||
file = listOfFiles.currentFile
|
||||
|
||||
file = it.currentFile
|
||||
updateUiElements()
|
||||
}
|
||||
}
|
||||
|
|
@ -170,19 +177,21 @@ open class FolderPickerActivity :
|
|||
|
||||
override fun onActionModeStarted(mode: ActionMode) {
|
||||
super.onActionModeStarted(mode)
|
||||
if (account != null) {
|
||||
updateFileFromDB()
|
||||
var folder = file
|
||||
if (folder == null || !folder.isFolder) {
|
||||
// fall back to root folder
|
||||
file = storageManager.getFileByPath(OCFile.ROOT_PATH)
|
||||
folder = file
|
||||
}
|
||||
val listOfFolders = listOfFilesFragment
|
||||
listOfFolders!!.listDirectory(folder, false, false)
|
||||
startSyncFolderOperation(folder, false)
|
||||
updateUiElements()
|
||||
|
||||
if (action == null) {
|
||||
return
|
||||
}
|
||||
|
||||
updateFileFromDB()
|
||||
var folder = file
|
||||
if (folder == null || !folder.isFolder) {
|
||||
file = storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
|
||||
folder = file
|
||||
}
|
||||
|
||||
listOfFilesFragment?.listDirectory(folder, false, false)
|
||||
startSyncFolderOperation(folder, false)
|
||||
updateUiElements()
|
||||
}
|
||||
|
||||
private val activity: Activity
|
||||
|
|
@ -190,12 +199,16 @@ open class FolderPickerActivity :
|
|||
|
||||
protected open fun createFragments() {
|
||||
val listOfFiles = OCFileListFragment()
|
||||
val args = Bundle()
|
||||
args.putBoolean(OCFileListFragment.ARG_ONLY_FOLDERS_CLICKABLE, true)
|
||||
args.putBoolean(OCFileListFragment.ARG_HIDE_FAB, true)
|
||||
args.putBoolean(OCFileListFragment.ARG_HIDE_ITEM_OPTIONS, true)
|
||||
args.putBoolean(OCFileListFragment.ARG_SEARCH_ONLY_FOLDER, mSearchOnlyFolders)
|
||||
listOfFiles.arguments = args
|
||||
|
||||
val bundle = Bundle().apply {
|
||||
putBoolean(OCFileListFragment.ARG_ONLY_FOLDERS_CLICKABLE, true)
|
||||
putBoolean(OCFileListFragment.ARG_HIDE_FAB, true)
|
||||
putBoolean(OCFileListFragment.ARG_HIDE_ITEM_OPTIONS, true)
|
||||
putBoolean(OCFileListFragment.ARG_SEARCH_ONLY_FOLDER, mSearchOnlyFolders)
|
||||
}
|
||||
|
||||
listOfFiles.arguments = bundle
|
||||
|
||||
val transaction = supportFragmentManager.beginTransaction()
|
||||
transaction.add(R.id.fragment_container, listOfFiles, TAG_LIST_OF_FOLDERS)
|
||||
transaction.commit()
|
||||
|
|
@ -206,30 +219,35 @@ open class FolderPickerActivity :
|
|||
*/
|
||||
private fun setBackgroundText() {
|
||||
val listFragment = listOfFilesFragment
|
||||
if (listFragment != null) {
|
||||
|
||||
if (listFragment == null) {
|
||||
Log_OC.e(TAG, "OCFileListFragment is null")
|
||||
}
|
||||
|
||||
listFragment?.let {
|
||||
if (!mSyncInProgress) {
|
||||
listFragment.setMessageForEmptyList(
|
||||
it.setMessageForEmptyList(
|
||||
R.string.folder_list_empty_headline,
|
||||
R.string.file_list_empty_moving,
|
||||
R.drawable.ic_list_empty_create_folder,
|
||||
true
|
||||
)
|
||||
} else {
|
||||
listFragment.setEmptyListLoadingMessage()
|
||||
it.setEmptyListLoadingMessage()
|
||||
}
|
||||
} else {
|
||||
Log_OC.e(TAG, "OCFileListFragment is null")
|
||||
}
|
||||
}
|
||||
|
||||
protected val listOfFilesFragment: OCFileListFragment?
|
||||
protected get() {
|
||||
get() {
|
||||
val listOfFiles = supportFragmentManager.findFragmentByTag(TAG_LIST_OF_FOLDERS)
|
||||
if (listOfFiles != null) {
|
||||
|
||||
return if (listOfFiles != null) {
|
||||
return listOfFiles as OCFileListFragment?
|
||||
} else {
|
||||
Log_OC.e(TAG, "Access to non existing list of files fragment!!")
|
||||
null
|
||||
}
|
||||
Log_OC.e(TAG, "Access to non existing list of files fragment!!")
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -241,7 +259,6 @@ open class FolderPickerActivity :
|
|||
override fun onBrowsedDownTo(directory: OCFile) {
|
||||
file = directory
|
||||
updateUiElements()
|
||||
// Sync Folder
|
||||
startSyncFolderOperation(directory, false)
|
||||
}
|
||||
|
||||
|
|
@ -253,8 +270,7 @@ open class FolderPickerActivity :
|
|||
val currentSyncTime = System.currentTimeMillis()
|
||||
mSyncInProgress = true
|
||||
|
||||
// perform folder synchronization
|
||||
val refreshFolderOperation: RemoteOperation<*> = RefreshFolderOperation(
|
||||
RefreshFolderOperation(
|
||||
folder,
|
||||
currentSyncTime,
|
||||
false,
|
||||
|
|
@ -262,53 +278,62 @@ open class FolderPickerActivity :
|
|||
storageManager,
|
||||
user.orElseThrow { RuntimeException("User not set") },
|
||||
applicationContext
|
||||
)
|
||||
refreshFolderOperation.execute(account, this, null, null)
|
||||
listOfFilesFragment!!.isLoading = true
|
||||
).also {
|
||||
it.execute(account, this, null, null)
|
||||
}
|
||||
|
||||
listOfFilesFragment?.isLoading = true
|
||||
setBackgroundText()
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
Log_OC.e(TAG, "onResume() start")
|
||||
listOfFilesFragment!!.isLoading = mSyncInProgress
|
||||
|
||||
// refresh list of files
|
||||
listOfFilesFragment?.isLoading = mSyncInProgress
|
||||
refreshListOfFilesFragment(false)
|
||||
|
||||
file = listOfFilesFragment?.currentFile
|
||||
updateUiElements()
|
||||
|
||||
// Listen for sync messages
|
||||
val syncIntentFilter = IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START)
|
||||
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END)
|
||||
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED)
|
||||
syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED)
|
||||
syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED)
|
||||
val intentFilter = getSyncIntentFilter()
|
||||
mSyncBroadcastReceiver = SyncBroadcastReceiver()
|
||||
localBroadcastManager.registerReceiver(mSyncBroadcastReceiver!!, syncIntentFilter)
|
||||
mSyncBroadcastReceiver?.let {
|
||||
localBroadcastManager.registerReceiver(it, intentFilter)
|
||||
}
|
||||
|
||||
Log_OC.d(TAG, "onResume() end")
|
||||
}
|
||||
|
||||
private fun getSyncIntentFilter(): IntentFilter {
|
||||
return IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START).apply {
|
||||
addAction(FileSyncAdapter.EVENT_FULL_SYNC_END)
|
||||
addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED)
|
||||
addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED)
|
||||
addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
Log_OC.e(TAG, "onPause() start")
|
||||
|
||||
if (mSyncBroadcastReceiver != null) {
|
||||
localBroadcastManager.unregisterReceiver(mSyncBroadcastReceiver!!)
|
||||
mSyncBroadcastReceiver = null
|
||||
}
|
||||
|
||||
Log_OC.d(TAG, "onPause() end")
|
||||
super.onPause()
|
||||
}
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
||||
val inflater = menuInflater
|
||||
inflater.inflate(R.menu.activity_folder_picker, menu)
|
||||
menuInflater.inflate(R.menu.activity_folder_picker, menu)
|
||||
return super.onCreateOptionsMenu(menu)
|
||||
}
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
var retval = true
|
||||
val itemId = item.itemId
|
||||
|
||||
if (itemId == R.id.action_create_dir) {
|
||||
val dialog = CreateFolderDialogFragment.newInstance(currentFolder)
|
||||
dialog.show(supportFragmentManager, CreateFolderDialogFragment.CREATE_FOLDER_FRAGMENT)
|
||||
|
|
@ -320,6 +345,7 @@ open class FolderPickerActivity :
|
|||
} else {
|
||||
retval = super.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
return retval
|
||||
}
|
||||
|
||||
|
|
@ -327,35 +353,31 @@ open class FolderPickerActivity :
|
|||
val currentFolder: OCFile?
|
||||
get() {
|
||||
val currentFile = file
|
||||
var finalFolder: OCFile? = null
|
||||
val storageManager = storageManager
|
||||
|
||||
// If the file is null, take the root folder to avoid any error in functions depending on this one
|
||||
if (currentFile != null) {
|
||||
return if (currentFile != null) {
|
||||
if (currentFile.isFolder) {
|
||||
finalFolder = currentFile
|
||||
currentFile
|
||||
} else if (currentFile.remotePath != null) {
|
||||
val parentPath = File(currentFile.remotePath).parent
|
||||
finalFolder = storageManager.getFileByPath(parentPath)
|
||||
storageManager.getFileByEncryptedRemotePath(parentPath)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
} else {
|
||||
finalFolder = storageManager.getFileByPath(OCFile.ROOT_PATH)
|
||||
storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
|
||||
}
|
||||
return finalFolder
|
||||
}
|
||||
|
||||
private fun refreshListOfFilesFragment(fromSearch: Boolean) {
|
||||
val fileListFragment = listOfFilesFragment
|
||||
fileListFragment?.listDirectory(false, fromSearch)
|
||||
listOfFilesFragment?.listDirectory(false, fromSearch)
|
||||
}
|
||||
|
||||
fun browseToRoot() {
|
||||
val listOfFiles = listOfFilesFragment
|
||||
if (listOfFiles != null) {
|
||||
// should never be null, indeed
|
||||
val root = storageManager.getFileByPath(OCFile.ROOT_PATH)
|
||||
listOfFiles.listDirectory(root, false, false)
|
||||
file = listOfFiles.currentFile
|
||||
listOfFilesFragment?.let {
|
||||
val root = storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
|
||||
it.listDirectory(root, false, false)
|
||||
file = it.currentFile
|
||||
updateUiElements()
|
||||
startSyncFolderOperation(root, false)
|
||||
}
|
||||
|
|
@ -367,80 +389,71 @@ open class FolderPickerActivity :
|
|||
}
|
||||
|
||||
private fun toggleChooseEnabled() {
|
||||
mCopyBtn?.isEnabled = checkFolderSelectable()
|
||||
mMoveBtn?.isEnabled = checkFolderSelectable()
|
||||
if (this is FilePickerActivity) {
|
||||
return
|
||||
} else {
|
||||
folderPickerBinding.folderPickerBtnCopy.isEnabled = checkFolderSelectable()
|
||||
folderPickerBinding.folderPickerBtnMove.isEnabled = checkFolderSelectable()
|
||||
}
|
||||
}
|
||||
|
||||
// for copy and move, disable selecting parent folder of target files
|
||||
private fun checkFolderSelectable(): Boolean {
|
||||
return when {
|
||||
mAction != MOVE_OR_COPY -> true
|
||||
mTargetFilePaths.isNullOrEmpty() -> true
|
||||
action != MOVE_OR_COPY -> true
|
||||
targetFilePaths.isNullOrEmpty() -> true
|
||||
file?.isFolder != true -> true
|
||||
|
||||
// all of the target files are already in the selected directory
|
||||
mTargetFilePaths!!.all { PathUtils.isDirectParent(file.remotePath, it) } -> false
|
||||
targetFilePaths?.all { PathUtils.isDirectParent(file.remotePath, it) } == true -> false
|
||||
|
||||
// some of the target files are parents of the selected folder
|
||||
mTargetFilePaths!!.any { PathUtils.isAncestor(it, file.remotePath) } -> false
|
||||
targetFilePaths?.any { PathUtils.isAncestor(it, file.remotePath) } == true -> false
|
||||
else -> true
|
||||
}
|
||||
}
|
||||
|
||||
private fun updateNavigationElementsInActionBar() {
|
||||
val currentDir = currentFolder
|
||||
val actionBar = supportActionBar
|
||||
if (actionBar != null) {
|
||||
val atRoot = currentDir == null || currentDir.parentId == 0L
|
||||
supportActionBar?.let { actionBar ->
|
||||
val atRoot = (currentDir == null || currentDir.parentId == 0L)
|
||||
actionBar.setDisplayHomeAsUpEnabled(!atRoot)
|
||||
actionBar.setHomeButtonEnabled(!atRoot)
|
||||
val title = if (atRoot) caption ?: "" else currentDir!!.fileName
|
||||
viewThemeUtils.files.themeActionBar(this, actionBar, title)
|
||||
val title = if (atRoot) captionText ?: "" else currentDir?.fileName
|
||||
title?.let {
|
||||
viewThemeUtils.files.themeActionBar(this, actionBar, title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set per-view controllers
|
||||
*/
|
||||
private fun initControls() {
|
||||
mCancelBtn = findViewById(R.id.folder_picker_btn_cancel)
|
||||
mCopyBtn = findViewById(R.id.folder_picker_btn_copy)
|
||||
mMoveBtn = findViewById(R.id.folder_picker_btn_move)
|
||||
mChooseBtn = findViewById(R.id.folder_picker_btn_choose)
|
||||
if (this is FilePickerActivity) {
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(filesPickerBinding.folderPickerBtnCancel)
|
||||
filesPickerBinding.folderPickerBtnCancel.setOnClickListener { finish() }
|
||||
} else {
|
||||
viewThemeUtils.material.colorMaterialButtonText(folderPickerBinding.folderPickerBtnCancel)
|
||||
folderPickerBinding.folderPickerBtnCancel.setOnClickListener { finish() }
|
||||
|
||||
mCopyBtn?.let {
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(it)
|
||||
it.setOnClickListener(this)
|
||||
}
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryTonal(folderPickerBinding.folderPickerBtnChoose)
|
||||
folderPickerBinding.folderPickerBtnChoose.setOnClickListener { processOperation(null) }
|
||||
|
||||
mMoveBtn?.let {
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryTonal(it)
|
||||
it.setOnClickListener(this)
|
||||
}
|
||||
|
||||
mChooseBtn?.let {
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryTonal(it)
|
||||
it.setOnClickListener(this)
|
||||
}
|
||||
|
||||
mCancelBtn?.let {
|
||||
if (this is FilePickerActivity) {
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(it)
|
||||
} else {
|
||||
viewThemeUtils.material.colorMaterialButtonText(it)
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(folderPickerBinding.folderPickerBtnCopy)
|
||||
folderPickerBinding.folderPickerBtnCopy.setOnClickListener {
|
||||
processOperation(
|
||||
OperationsService.ACTION_COPY_FILE
|
||||
)
|
||||
}
|
||||
|
||||
it.setOnClickListener(this)
|
||||
viewThemeUtils.material.colorMaterialButtonPrimaryTonal(folderPickerBinding.folderPickerBtnMove)
|
||||
folderPickerBinding.folderPickerBtnMove.setOnClickListener {
|
||||
processOperation(
|
||||
OperationsService.ACTION_MOVE_FILE
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onClick(v: View) {
|
||||
when (v) {
|
||||
mChooseBtn -> processOperation(v)
|
||||
mCancelBtn -> finish()
|
||||
mCopyBtn, mMoveBtn -> processOperation(v)
|
||||
}
|
||||
}
|
||||
|
||||
private fun processOperation(v: View) {
|
||||
private fun processOperation(action: String?) {
|
||||
val i = intent
|
||||
val resultData = Intent()
|
||||
resultData.putExtra(EXTRA_FOLDER, listOfFilesFragment?.currentFile)
|
||||
|
|
@ -449,28 +462,18 @@ open class FolderPickerActivity :
|
|||
resultData.putParcelableArrayListExtra(EXTRA_FILES, targetFiles)
|
||||
}
|
||||
|
||||
mTargetFilePaths?.let {
|
||||
if (v == mCopyBtn || v == mMoveBtn) {
|
||||
moveOrCopyFiles(v, it)
|
||||
targetFilePaths?.let { filePaths ->
|
||||
action?.let { action ->
|
||||
fileOperationsHelper.moveOrCopyFiles(action, filePaths, file)
|
||||
}
|
||||
|
||||
resultData.putStringArrayListExtra(EXTRA_FILE_PATHS, it)
|
||||
resultData.putStringArrayListExtra(EXTRA_FILE_PATHS, filePaths)
|
||||
}
|
||||
|
||||
setResult(RESULT_OK, resultData)
|
||||
finish()
|
||||
}
|
||||
|
||||
private fun moveOrCopyFiles(v: View, filePathList: ArrayList<String>) {
|
||||
val action = if (v == mCopyBtn) {
|
||||
OperationsService.ACTION_COPY_FILE
|
||||
} else {
|
||||
OperationsService.ACTION_MOVE_FILE
|
||||
}
|
||||
|
||||
fileOperationsHelper.moveOrCopyFiles(action, filePathList, file)
|
||||
}
|
||||
|
||||
override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>) {
|
||||
super.onRemoteOperationFinish(operation, result)
|
||||
if (operation is CreateFolderOperation) {
|
||||
|
|
@ -504,10 +507,13 @@ open class FolderPickerActivity :
|
|||
}
|
||||
|
||||
fun search(query: String?) {
|
||||
val fileListFragment = listOfFilesFragment
|
||||
fileListFragment?.onMessageEvent(
|
||||
if (query == null) {
|
||||
return
|
||||
}
|
||||
|
||||
listOfFilesFragment?.onMessageEvent(
|
||||
SearchEvent(
|
||||
query!!,
|
||||
query,
|
||||
SearchRemoteOperation.SearchType.FILE_SEARCH
|
||||
)
|
||||
)
|
||||
|
|
@ -529,60 +535,45 @@ open class FolderPickerActivity :
|
|||
Log_OC.d(TAG, "Received broadcast $event")
|
||||
val accountName = intent.getStringExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME)
|
||||
val syncFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH)
|
||||
|
||||
val syncResult = DataHolderUtil.getInstance()
|
||||
.retrieve(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT)) as RemoteOperationResult<*>
|
||||
val sameAccount = account != null && accountName == account.name && storageManager != null
|
||||
if (sameAccount) {
|
||||
if (FileSyncAdapter.EVENT_FULL_SYNC_START == event) {
|
||||
mSyncInProgress = true
|
||||
} else {
|
||||
var currentFile = if (file == null) null else storageManager.getFileByPath(file.remotePath)
|
||||
val currentDir = if (currentFolder == null) {
|
||||
null
|
||||
} else {
|
||||
storageManager.getFileByPath(
|
||||
currentFolder!!.remotePath
|
||||
)
|
||||
}
|
||||
if (currentDir == null) {
|
||||
// current folder was removed from the server
|
||||
DisplayUtils.showSnackMessage(
|
||||
activity,
|
||||
R.string.sync_current_folder_was_removed,
|
||||
currentFolder!!.fileName
|
||||
)
|
||||
browseToRoot()
|
||||
} else {
|
||||
if (currentFile == null && !file.isFolder) {
|
||||
// currently selected file was removed in the server, and now we know it
|
||||
currentFile = currentDir
|
||||
}
|
||||
if (currentDir.remotePath == syncFolderRemotePath) {
|
||||
val fileListFragment = listOfFilesFragment
|
||||
fileListFragment?.listDirectory(currentDir, false, false)
|
||||
}
|
||||
file = currentFile
|
||||
}
|
||||
mSyncInProgress = FileSyncAdapter.EVENT_FULL_SYNC_END != event &&
|
||||
RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED != event
|
||||
if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED == event && !syncResult.isSuccess
|
||||
) {
|
||||
if (ResultCode.UNAUTHORIZED == syncResult.code || (
|
||||
syncResult.isException &&
|
||||
syncResult.exception is AuthenticatorException
|
||||
)
|
||||
) {
|
||||
requestCredentialsUpdate(context)
|
||||
} else if (ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED == syncResult.code) {
|
||||
showUntrustedCertDialog(syncResult)
|
||||
}
|
||||
}
|
||||
}
|
||||
DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
|
||||
Log_OC.d(TAG, "Setting progress visibility to $mSyncInProgress")
|
||||
listOfFilesFragment!!.isLoading = mSyncInProgress
|
||||
setBackgroundText()
|
||||
val sameAccount = (account != null && accountName == account.name && storageManager != null)
|
||||
|
||||
if (!sameAccount) {
|
||||
return
|
||||
}
|
||||
|
||||
if (FileSyncAdapter.EVENT_FULL_SYNC_START == event) {
|
||||
mSyncInProgress = true
|
||||
} else {
|
||||
var (currentFile, currentDir) = getCurrentFileAndDirectory()
|
||||
|
||||
if (currentDir == null) {
|
||||
browseRootForRemovedFolder()
|
||||
} else {
|
||||
if (currentFile == null && !file.isFolder) {
|
||||
// currently selected file was removed in the server, and now we know it
|
||||
currentFile = currentDir
|
||||
}
|
||||
if (currentDir.remotePath == syncFolderRemotePath) {
|
||||
listOfFilesFragment?.listDirectory(currentDir, false, false)
|
||||
}
|
||||
file = currentFile
|
||||
}
|
||||
|
||||
mSyncInProgress = (
|
||||
FileSyncAdapter.EVENT_FULL_SYNC_END != event &&
|
||||
RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED != event
|
||||
)
|
||||
|
||||
checkCredentials(syncResult, context, event)
|
||||
}
|
||||
|
||||
DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
|
||||
Log_OC.d(TAG, "Setting progress visibility to $mSyncInProgress")
|
||||
listOfFilesFragment?.isLoading = mSyncInProgress
|
||||
setBackgroundText()
|
||||
} catch (e: RuntimeException) {
|
||||
Log_OC.e(TAG, "Error on broadcast receiver", e)
|
||||
// avoid app crashes after changing the serial id of RemoteOperationResult
|
||||
|
|
@ -590,6 +581,45 @@ open class FolderPickerActivity :
|
|||
DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
|
||||
}
|
||||
}
|
||||
|
||||
private fun getCurrentFileAndDirectory(): Pair<OCFile?, OCFile?> {
|
||||
val currentFile =
|
||||
if (file == null) null else storageManager.getFileByEncryptedRemotePath(file.remotePath)
|
||||
|
||||
val currentDir = if (currentFolder == null) {
|
||||
null
|
||||
} else {
|
||||
storageManager.getFileByEncryptedRemotePath(
|
||||
currentFolder?.remotePath
|
||||
)
|
||||
}
|
||||
|
||||
return Pair(currentFile, currentDir)
|
||||
}
|
||||
|
||||
private fun browseRootForRemovedFolder() {
|
||||
DisplayUtils.showSnackMessage(
|
||||
activity,
|
||||
R.string.sync_current_folder_was_removed,
|
||||
currentFolder?.fileName
|
||||
)
|
||||
browseToRoot()
|
||||
}
|
||||
|
||||
private fun checkCredentials(syncResult: RemoteOperationResult<*>, context: Context, event: String?) {
|
||||
if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED == event && !syncResult.isSuccess
|
||||
) {
|
||||
if (ResultCode.UNAUTHORIZED == syncResult.code || (
|
||||
syncResult.isException &&
|
||||
syncResult.exception is AuthenticatorException
|
||||
)
|
||||
) {
|
||||
requestCredentialsUpdate(context)
|
||||
} else if (ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED == syncResult.code) {
|
||||
showUntrustedCertDialog(syncResult)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun showDetails(file: OCFile) {
|
||||
|
|
@ -616,10 +646,8 @@ open class FolderPickerActivity :
|
|||
}
|
||||
|
||||
private fun refreshList(ignoreETag: Boolean) {
|
||||
val listOfFiles = listOfFilesFragment
|
||||
if (listOfFiles != null) {
|
||||
val folder = listOfFiles.currentFile
|
||||
folder?.let { startSyncFolderOperation(it, ignoreETag) }
|
||||
listOfFilesFragment?.currentFile?.let {
|
||||
startSyncFolderOperation(it, ignoreETag)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue