diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt index c2feb639f63..fd0eebe6880 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt @@ -71,14 +71,11 @@ fun Throwable.parseError( is CopyIntoDescendantException -> resources.getString(R.string.copy_file_invalid_into_descendent) is CopyIntoSameFolderException -> resources.getString(R.string.copy_file_invalid_overwrite) is FileAlreadyExistsException -> resources.getString(R.string.file_already_exists) - is FileNameException -> { - val stringId = when (this.type) { + is FileNameException -> resources.getString(when (this.type) { FileNameException.FileNameExceptionType.FILE_NAME_EMPTY -> R.string.filename_empty FileNameException.FileNameExceptionType.FILE_NAME_FORBIDDEN_CHARACTERS -> R.string.filename_forbidden_characters_from_server FileNameException.FileNameExceptionType.FILE_NAME_TOO_LONG -> R.string.filename_too_long - } - resources.getString(stringId) - } + }) is FileNotFoundException -> resources.getString(R.string.common_not_found) is ForbiddenException -> resources.getString(R.string.uploads_view_upload_status_failed_permission_error) is IncorrectAddressException -> resources.getString(R.string.auth_incorrect_address_title) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt index 17131a69291..08dc3e1d6b6 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt @@ -185,23 +185,33 @@ class FileDetailsFragment : FileFragment() { } is UIResult.Loading -> {} - is UIResult.Success -> when (uiResult.data) { - SynchronizeFileUseCase.SyncType.AlreadySynchronized -> showMessageInSnackbar(getString(R.string.sync_file_nothing_to_do_msg)) - is SynchronizeFileUseCase.SyncType.ConflictDetected -> { - val showConflictActivityIntent = Intent(requireActivity(), ConflictsResolveActivity::class.java) - showConflictActivityIntent.putExtra(ConflictsResolveActivity.EXTRA_FILE, file) - startActivity(showConflictActivityIntent) - } + is UIResult.Success -> { + when (uiResult.data) { + SynchronizeFileUseCase.SyncType.AlreadySynchronized -> { + showMessageInSnackbar(getString(R.string.sync_file_nothing_to_do_msg)) + } + is SynchronizeFileUseCase.SyncType.ConflictDetected -> { + val showConflictActivityIntent = Intent(requireActivity(), ConflictsResolveActivity::class.java) + showConflictActivityIntent.putExtra(ConflictsResolveActivity.EXTRA_FILE, file) + startActivity(showConflictActivityIntent) + } - is SynchronizeFileUseCase.SyncType.DownloadEnqueued -> { - fileDetailsViewModel.startListeningToWorkInfo(uiResult.data.workerId) - } + is SynchronizeFileUseCase.SyncType.DownloadEnqueued -> { + fileDetailsViewModel.startListeningToWorkInfo(uiResult.data.workerId) + } - SynchronizeFileUseCase.SyncType.FileNotFound -> showMessageInSnackbar(getString(R.string.sync_file_not_found_msg)) + SynchronizeFileUseCase.SyncType.FileNotFound -> { + showMessageInSnackbar(getString(R.string.sync_file_not_found_msg)) + } - is SynchronizeFileUseCase.SyncType.UploadEnqueued -> fileDetailsViewModel.startListeningToWorkInfo(uiResult.data.workerId) + is SynchronizeFileUseCase.SyncType.UploadEnqueued -> { + fileDetailsViewModel.startListeningToWorkInfo(uiResult.data.workerId) + } - null -> showMessageInSnackbar(getString(R.string.common_error_unknown)) + null -> { + showMessageInSnackbar(getString(R.string.common_error_unknown)) + } + } } } }) @@ -323,7 +333,9 @@ class FileDetailsFragment : FileFragment() { true } - else -> super.onOptionsItemSelected(item) + else -> { + super.onOptionsItemSelected(item) + } } } @@ -579,7 +591,9 @@ class FileDetailsFragment : FileFragment() { fileDisplayActivity.startTextPreview(fileWaitingToPreview) } - else -> fileDisplayActivity.openOCFile(fileWaitingToPreview) + else -> { + fileDisplayActivity.openOCFile(fileWaitingToPreview) + } } fileOperationsViewModel.setLastUsageFile(fileWaitingToPreview) } diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt index 26dd4d451ec..a803014f461 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt @@ -866,7 +866,9 @@ class MainFileListFragment : Fragment(), collectLatestLifecycleFlow(fileOperationsViewModel.checkIfFileIsLocalAndNotAvailableOfflineSharedFlow) { val fileActivity = (requireActivity() as FileActivity) when (it) { - is UIResult.Loading -> fileActivity.showLoadingDialog(R.string.common_loading) + is UIResult.Loading -> { + fileActivity.showLoadingDialog(R.string.common_loading) + } is UIResult.Success -> { fileActivity.dismissLoadingDialog() it.data?.let { result -> onShowRemoveDialog(filesToRemove, result) } diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt index b690437b01c..006b446e1a5 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt @@ -451,7 +451,9 @@ class PassCodeActivity : AppCompatActivity(), NumberKeyboardListener, EnableBiom true } - else -> super.onKeyUp(keyCode, event) + else -> { + super.onKeyUp(keyCode, event) + } } companion object { diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt index 7b776c9731b..3fc1c72b64b 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareActivity.kt @@ -125,7 +125,9 @@ class ShareActivity : FileActivity(), ShareFragmentListener { data?.authority ) } - else -> Timber.e("Unexpected intent $intent") + else -> { + Timber.e("Unexpected intent $intent") + } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt b/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt index 3a9c2a88f12..2f7906723c7 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt @@ -160,14 +160,13 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi "", whereArgs ) } - ROOT_DIRECTORY -> - count = db.delete(ProviderTableMeta.FILE_TABLE_NAME, where, whereArgs) - SHARES -> count = db.delete(ProviderTableMeta.OCSHARES_TABLE_NAME, where, whereArgs) - CAPABILITIES -> count = db.delete(ProviderTableMeta.CAPABILITIES_TABLE_NAME, where, whereArgs) - UPLOADS -> count = db.delete(ProviderTableMeta.UPLOADS_TABLE_NAME, where, whereArgs) - CAMERA_UPLOADS_SYNC -> count = db.delete(ProviderTableMeta.CAMERA_UPLOADS_SYNC_TABLE_NAME, where, whereArgs) - QUOTAS -> count = db.delete(ProviderTableMeta.USER_QUOTAS_TABLE_NAME, where, whereArgs) - else -> throw IllegalArgumentException("Unknown uri: $uri") + ROOT_DIRECTORY -> { count = db.delete(ProviderTableMeta.FILE_TABLE_NAME, where, whereArgs) } + SHARES -> { count = db.delete(ProviderTableMeta.OCSHARES_TABLE_NAME, where, whereArgs) } + CAPABILITIES -> { count = db.delete(ProviderTableMeta.CAPABILITIES_TABLE_NAME, where, whereArgs) } + UPLOADS -> { count = db.delete(ProviderTableMeta.UPLOADS_TABLE_NAME, where, whereArgs) } + CAMERA_UPLOADS_SYNC -> { count = db.delete(ProviderTableMeta.CAMERA_UPLOADS_SYNC_TABLE_NAME, where, whereArgs) } + QUOTAS -> { count = db.delete(ProviderTableMeta.USER_QUOTAS_TABLE_NAME, where, whereArgs) } + else -> { throw IllegalArgumentException("Unknown uri: $uri") } } return count } @@ -267,7 +266,9 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi if (quotaId <= 0) throw SQLException("ERROR $uri") ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_QUOTAS, quotaId) } - else -> throw IllegalArgumentException("Unknown uri id: $uri") + else -> { + throw IllegalArgumentException("Unknown uri id: $uri") + } } override fun onCreate(): Boolean { @@ -315,7 +316,9 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi sqlQuery.tables = ProviderTableMeta.FILE_TABLE_NAME when (uriMatcher.match(uri)) { - ROOT_DIRECTORY -> sqlQuery.projectionMap = fileProjectionMap + ROOT_DIRECTORY -> { + sqlQuery.projectionMap = fileProjectionMap + } DIRECTORY -> { val folderId = uri.pathSegments[1] sqlQuery.appendWhere( @@ -364,7 +367,9 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi } sqlQuery.projectionMap = quotaProjectionMap } - else -> throw IllegalArgumentException("Unknown uri id: $uri") + else -> { + throw IllegalArgumentException("Unknown uri id: $uri") + } } val order: String? = if (TextUtils.isEmpty(sortOrder)) { @@ -413,19 +418,29 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi throw IllegalArgumentException("Selection not allowed, use parameterized queries") } return when (uriMatcher.match(uri)) { - DIRECTORY -> 0 //updateFolderSize(db, selectionArgs[0]); - SHARES -> db.update(ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs) - CAPABILITIES -> db.update(ProviderTableMeta.CAPABILITIES_TABLE_NAME, values, selection, selectionArgs) + DIRECTORY -> { + 0 //updateFolderSize(db, selectionArgs[0]); + } + SHARES -> { + db.update(ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs) + } + CAPABILITIES -> { + db.update(ProviderTableMeta.CAPABILITIES_TABLE_NAME, values, selection, selectionArgs) + } UPLOADS -> { val ret = db.update(ProviderTableMeta.UPLOADS_TABLE_NAME, values, selection, selectionArgs) trimSuccessfulUploads(db) ret } - CAMERA_UPLOADS_SYNC -> db.update(ProviderTableMeta.CAMERA_UPLOADS_SYNC_TABLE_NAME, values, selection, selectionArgs) - QUOTAS -> db.update(ProviderTableMeta.USER_QUOTAS_TABLE_NAME, values, selection, selectionArgs) - else -> db.update( - ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs - ) + CAMERA_UPLOADS_SYNC -> { + db.update(ProviderTableMeta.CAMERA_UPLOADS_SYNC_TABLE_NAME, values, selection, selectionArgs) + } + QUOTAS -> { + db.update(ProviderTableMeta.USER_QUOTAS_TABLE_NAME, values, selection, selectionArgs) + } + else -> { + db.update(ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs) + } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt index a4f61d56312..d01e9e27f9c 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt @@ -189,10 +189,10 @@ abstract class DrawerActivity : ToolbarActivity() { val settingsIntent = Intent(applicationContext, SettingsActivity::class.java) startActivity(settingsIntent) } - R.id.drawer_menu_feedback -> openFeedback() - R.id.drawer_menu_help -> openHelp() - R.id.drawer_menu_privacy_policy -> openPrivacyPolicy() - else -> Timber.i("Unknown drawer menu item clicked: %s", menuItem.title) + R.id.drawer_menu_feedback -> { openFeedback() } + R.id.drawer_menu_help -> { openHelp() } + R.id.drawer_menu_privacy_policy -> { openPrivacyPolicy() } + else -> { Timber.i("Unknown drawer menu item clicked: %s", menuItem.title) } } true } @@ -316,8 +316,8 @@ abstract class DrawerActivity : ToolbarActivity() { } } } - is UIResult.Loading -> getAccountQuotaText()?.text = getString(R.string.drawer_loading_quota) - is UIResult.Error -> getAccountQuotaText()?.text = getString(R.string.drawer_unavailable_used_storage) + is UIResult.Loading -> { getAccountQuotaText()?.text = getString(R.string.drawer_loading_quota) } + is UIResult.Error -> { getAccountQuotaText()?.text = getString(R.string.drawer_unavailable_used_storage) } } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index 3ae2e34bb9f..e7d508def32 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -1350,7 +1350,9 @@ class FileDisplayActivity : FileActivity(), /** Nothing to do atm. If we are in details view, go back to file list */ } - is SynchronizeFileUseCase.SyncType.UploadEnqueued -> showSnackMessage(getString(R.string.upload_enqueued_msg)) + is SynchronizeFileUseCase.SyncType.UploadEnqueued -> { + showSnackMessage(getString(R.string.upload_enqueued_msg)) + } null -> { /* Nothing to do */ } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt index 9614d60e9bb..a2dc0867e63 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt @@ -79,12 +79,10 @@ class ErrorMessageAdapter { if (throwable == null) { return when (transferOperation) { - is Download -> { - formatter.format( - R.string.downloader_download_succeeded_content, - File(transferOperation.downloadPath).name - ) - } + is Download -> formatter.format( + R.string.downloader_download_succeeded_content, + File(transferOperation.downloadPath).name + ) is TransferOperation.Upload -> formatter.format( R.string.uploader_upload_succeeded_content_single, transferOperation.fileName @@ -96,9 +94,7 @@ class ErrorMessageAdapter { R.string.downloader_download_failed_content, File(transferOperation.downloadPath).name ) - is TransferOperation.Upload -> { - getMessageForFailedUpload(formatter, throwable, transferOperation) - } + is TransferOperation.Upload -> getMessageForFailedUpload(formatter, throwable, transferOperation) } return throwable.parseError(genericMessage, resources, true).toString() } @@ -118,23 +114,17 @@ class ErrorMessageAdapter { R.string.error__upload__local_file_not_copied, transferOperation.fileName, R.string.app_name ) - is ForbiddenException -> { - formatter.format( - R.string.forbidden_permissions, - R.string.uploader_upload_forbidden_permissions - ) - } - is InvalidCharacterException -> { - formatter.format( - R.string.filename_forbidden_characters_from_server - ) - } - is QuotaExceededException -> - formatter.format(R.string.failed_upload_quota_exceeded_text) - is FileNotFoundException -> { - formatter.format(R.string.uploads_view_upload_status_failed_folder_error) - } - else -> formatter.format(R.string.uploader_upload_failed_content_single, transferOperation.fileName) + is ForbiddenException -> formatter.format( + R.string.forbidden_permissions, + R.string.uploader_upload_forbidden_permissions + ) + is InvalidCharacterException -> formatter.format(R.string.filename_forbidden_characters_from_server) + is QuotaExceededException -> formatter.format(R.string.failed_upload_quota_exceeded_text) + is FileNotFoundException -> formatter.format(R.string.uploads_view_upload_status_failed_folder_error) + else -> formatter.format( + R.string.uploader_upload_failed_content_single, + transferOperation.fileName + ) } @@ -154,26 +144,22 @@ class ErrorMessageAdapter { val formatter = Formatter(resources) return when (result.code) { - ResultCode.FORBIDDEN -> { - formatter.format( - R.string.filename_forbidden_characters_from_server - ) - } + ResultCode.FORBIDDEN -> + formatter.format(R.string.filename_forbidden_characters_from_server) ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER -> formatter.format(R.string.filename_forbidden_characters_from_server) ResultCode.QUOTA_EXCEEDED -> formatter.format(R.string.failed_upload_quota_exceeded_text) - ResultCode.FILE_NOT_FOUND -> { + ResultCode.FILE_NOT_FOUND -> formatter.format(R.string.rename_local_fail_msg) - } ResultCode.INVALID_LOCAL_FILE_NAME -> formatter.format(R.string.rename_local_fail_msg) ResultCode.INVALID_CHARACTER_IN_NAME -> formatter.format(R.string.filename_forbidden_characters) - ResultCode.INVALID_OVERWRITE -> { + ResultCode.INVALID_OVERWRITE -> + formatter.format(R.string.move_file_error) + ResultCode.CONFLICT -> formatter.format(R.string.move_file_error) - } - ResultCode.CONFLICT -> formatter.format(R.string.move_file_error) ResultCode.INVALID_COPY_INTO_DESCENDANT -> formatter.format(R.string.copy_file_invalid_into_descendent) else -> getCommonMessageForResult(result, resources) diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt index ad07c8fe194..9353ef46096 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt @@ -312,7 +312,9 @@ class PreviewAudioFragment : FileFragment() { true } - else -> super.onOptionsItemSelected(item) + else -> { + super.onOptionsItemSelected(item) + } } private fun seeDetails() { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt index eed049e8e62..e86dec967e1 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt @@ -153,7 +153,9 @@ class PreviewImageActivity : FileActivity(), showErrorInSnackbar(R.string.remove_fail_msg, uiResult.getThrowableOrNull()) } - is UIResult.Loading -> showLoadingDialog(R.string.wait_a_moment) + is UIResult.Loading -> { + showLoadingDialog(R.string.wait_a_moment) + } is UIResult.Success -> { // Refresh the spaces and update the quota diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt index 77e1bd7411a..b8454472c92 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt @@ -259,7 +259,9 @@ class PreviewImageFragment : FileFragment() { true } - else -> super.onOptionsItemSelected(item) + else -> { + super.onOptionsItemSelected(item) + } } private fun seeDetails() { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt index 09ae1241779..af6476b121e 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt @@ -190,7 +190,9 @@ class PreviewVideoActivity : FileActivity(), Player.Listener, OnPrepareVideoPlay showErrorInSnackbar(R.string.remove_fail_msg, uiResult.getThrowableOrNull()) } - is UIResult.Loading -> showLoadingDialog(R.string.wait_a_moment) + is UIResult.Loading -> { + showLoadingDialog(R.string.wait_a_moment) + } is UIResult.Success -> { // Refresh the spaces and update the quota diff --git a/owncloudData/src/main/java/com/owncloud/android/data/RemoteOperationHandler.kt b/owncloudData/src/main/java/com/owncloud/android/data/RemoteOperationHandler.kt index 5f0c25e0d7c..c0b9e9c8ea3 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/RemoteOperationHandler.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/RemoteOperationHandler.kt @@ -92,11 +92,9 @@ private fun handleRemoteOperationResult( when (remoteOperationResult.code) { RemoteOperationResult.ResultCode.WRONG_CONNECTION -> throw NoConnectionWithServerException() RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION -> throw NoNetworkConnectionException() - RemoteOperationResult.ResultCode.TIMEOUT -> { + RemoteOperationResult.ResultCode.TIMEOUT -> if (remoteOperationResult.exception is SocketTimeoutException) throw ServerResponseTimeoutException() else throw ServerConnectionTimeoutException() - } - RemoteOperationResult.ResultCode.HOST_NOT_AVAILABLE -> throw ServerNotReachableException() RemoteOperationResult.ResultCode.SERVICE_UNAVAILABLE -> throw ServiceUnavailableException() RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED -> throw remoteOperationResult.exception as CertificateCombinedException