Skip to content

Commit

Permalink
Fixes from bitrise
Browse files Browse the repository at this point in the history
  • Loading branch information
Aitorbp committed Sep 13, 2023
1 parent 5e9edcb commit 706e619
Showing 1 changed file with 23 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ class FileDisplayActivity : FileActivity(),
genericErrorMessage = getString(R.string.copy_file_error),
resources = resources,
showJustReason = true,
)
)
)
}
}
Expand Down Expand Up @@ -1107,34 +1107,37 @@ class FileDisplayActivity : FileActivity(),
override fun onKeepBothButtonClick() {
applyAction(
posDialog = posDialog,
data = data ,
replace = replace ,
pos = posArray ,
data = data,
replace = replace,
pos = posArray,
launchAction = launchAction,
uiResult= uiResult,
action = false)
uiResult = uiResult,
action = false
)
}

override fun onSkipButtonClick() {
applyAction(
posDialog = posDialog,
data = data ,
replace = replace ,
pos = posArray ,
data = data,
replace = replace,
pos = posArray,
launchAction = launchAction,
uiResult= uiResult,
action = null)
uiResult = uiResult,
action = null
)
}

override fun onReplaceButtonClick() {
applyAction(
posDialog = posDialog,
data = data ,
replace = replace ,
pos = posArray ,
data = data,
replace = replace,
pos = posArray,
launchAction = launchAction,
uiResult= uiResult,
action = true)
uiResult = uiResult,
action = true
)
}
}
)
Expand All @@ -1161,7 +1164,7 @@ class FileDisplayActivity : FileActivity(),
launchAction(
uiResult.data!!,
replace,
)
)
}
}
dismissAllOpenDialogs()
Expand All @@ -1172,7 +1175,7 @@ class FileDisplayActivity : FileActivity(),
launchAction(
uiResult.data!!,
replace,
)
)
}
fileOperationsViewModel.openDialogs[posDialog1[0]].dismiss()
fileOperationsViewModel.openDialogs.removeAt(posDialog1[0])
Expand All @@ -1191,17 +1194,18 @@ class FileDisplayActivity : FileActivity(),
fileOperationsViewModel.openDialogs.clear()
}


private fun showDialogs() {
fileOperationsViewModel.openDialogs.forEach { dialog ->
dialog.show(this.supportFragmentManager, CUSTOM_DIALOG_TAG)
}
}

private fun dismissDialogs() {
fileOperationsViewModel.openDialogs.forEach { dialog ->
dialog.dismiss()
}
}

private fun launchCopyFile(files: List<OCFile>, replace: List<Boolean?>) {
fileOperationsViewModel.performOperation(
FileOperation.CopyOperation(
Expand Down

0 comments on commit 706e619

Please sign in to comment.