VladPolskiy/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2025-07-25 16:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix kt spotless

Browse Source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk
2025-07-14 10:42:34 +02:00
committed by Alper Öztürk
parent 1385269659
commit 1c81a7e268
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/nextcloud/client/database/entity/OfflineOperationEntity.kt
View File

@ -39,19 +39,16 @@ data class OfflineOperationEntity(
@ColumnInfo(name = ProviderTableMeta.OFFLINE_OPERATION_MODIFIED_AT) @ColumnInfo(name = ProviderTableMeta.OFFLINE_OPERATION_MODIFIED_AT)
var modifiedAt: Long? = null var modifiedAt: Long? = null
) { ) {
fun isRenameOrRemove(): Boolean { fun isRenameOrRemove(): Boolean =
return (type is OfflineOperationType.RenameFile || type is OfflineOperationType.RemoveFile) (type is OfflineOperationType.RenameFile || type is OfflineOperationType.RemoveFile)
}
fun getConflictText(context: Context): String { fun getConflictText(context: Context): String = if (type is OfflineOperationType.RemoveFile) {
return if (type is OfflineOperationType.RemoveFile) { context.getString(R.string.offline_operations_worker_notification_remove_conflict_text, filename)
context.getString(R.string.offline_operations_worker_notification_remove_conflict_text, filename) } else if (type is OfflineOperationType.RenameFile) {
} else if (type is OfflineOperationType.RenameFile) { context.getString(R.string.offline_operations_worker_notification_rename_conflict_text, filename)
context.getString(R.string.offline_operations_worker_notification_rename_conflict_text, filename) } else if (type is OfflineOperationType.CreateFile) {
} else if (type is OfflineOperationType.CreateFile) { context.getString(R.string.offline_operations_worker_notification_create_file_conflict_text, filename)
context.getString(R.string.offline_operations_worker_notification_create_file_conflict_text, filename) } else {
} else { context.getString(R.string.offline_operations_worker_notification_create_folder_conflict_text, filename)
context.getString(R.string.offline_operations_worker_notification_create_folder_conflict_text, filename)
}
} }
} }

4
app/src/main/java/com/nextcloud/client/jobs/offlineOperations/OfflineOperationsWorker.kt
View File

@ -278,7 +278,5 @@ class OfflineOperationsWorker(
} }
} }
private fun isFileChanged(remoteFile: RemoteFile, ocFile: OCFile): Boolean { private fun isFileChanged(remoteFile: RemoteFile, ocFile: OCFile): Boolean = remoteFile.etag != ocFile.etagOnServer
return remoteFile.etag != ocFile.etagOnServer
}
} }