mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-21 12:45:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: ktlint compliant kotlin formatting/code

Browse source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2024-06-27 19:46:41 +02:00
parent 90934f4ef4
commit 40d45bcb7a
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
76 changed files with 272 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -42,8 +42,10 @@ trim_trailing_whitespace=false
indent_size=2
[*.{kt,kts}]
ktlint_code_style = android_studio
# IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it
ktlint_standard_import-ordering = disabled
ktlint_standard_no-consecutive-comments = disabled
ktlint_function_naming_ignore_when_annotated_with = Composable
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false

3
app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt
View file

@ -177,8 +177,7 @@ object DocumentsProviderUtils {
*/
@Suppress("EXPERIMENTAL_API_USAGE")
@VisibleForTesting
internal suspend fun getLoadedCursor(timeout: Long = 15_000, query: () -> Cursor?) =
withTimeout(timeout) {
internal suspend fun getLoadedCursor(timeout: Long = 15_000, query: () -> Cursor?) = withTimeout(timeout) {
suspendCancellableCoroutine<Cursor> { cont ->
val cursor = query() ?: throw IOException("Initial query returned no results")
cont.invokeOnCancellation { cursor.close() }

10
app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt
View file

@ -21,8 +21,8 @@ import com.owncloud.android.R
import com.owncloud.android.ui.TextDrawable
internal class AvatarTestFragment : Fragment() {
lateinit var list1: LinearLayout
lateinit var list2: LinearLayout
private lateinit var list1: LinearLayout
private lateinit var list2: LinearLayout
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val view: View = inflater.inflate(R.layout.avatar_fragment, null)
@ -34,7 +34,7 @@ internal class AvatarTestFragment : Fragment() {
}
fun addAvatar(name: String, avatarRadius: Float, width: Int, targetContext: Context) {
val margin = padding
val margin = PADDING
val imageView = ImageView(targetContext)
imageView.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadius))
@ -47,7 +47,7 @@ internal class AvatarTestFragment : Fragment() {
}
fun addBitmap(bitmap: Bitmap, width: Int, list: Int, targetContext: Context) {
val margin = padding
val margin = PADDING
val imageView = ImageView(targetContext)
imageView.setImageBitmap(bitmap)
@ -64,6 +64,6 @@ internal class AvatarTestFragment : Fragment() {
}
companion object {
private const val padding = 10
private const val PADDING = 10
}
}

10
app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
View file

@ -672,10 +672,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
}
// open bottom sheet with actions
private fun openAdvancedPermissions(
sut: FileDetailSharingFragment,
userShare: OCShare
) {
private fun openAdvancedPermissions(sut: FileDetailSharingFragment, userShare: OCShare) {
activity.handler.post {
sut.showSharingMenuActionSheet(userShare)
}
@ -723,10 +720,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
/**
* verify send new email note text
*/
private fun verifySendNewEmail(
sut: FileDetailSharingFragment,
userShare: OCShare
) {
private fun verifySendNewEmail(sut: FileDetailSharingFragment, userShare: OCShare) {
activity.runOnUiThread { sut.showSharingMenuActionSheet(userShare) }
waitForIdleSync()

4
app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt
View file

@ -20,7 +20,9 @@ import org.junit.Test
class TrashbinActivityIT : AbstractIT() {
enum class TestCase {
ERROR, EMPTY, FILES
ERROR,
EMPTY,
FILES
}
@get:Rule

18
app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt
View file

@ -36,8 +36,10 @@ class TrashbinLocalRepository(private val testCase: TrashbinActivityIT.TestCase)
"image/png",
"/trashbin/test.png",
"subFolder/test.png",
1395847838, // random date
1395847908 // random date
// random date
1395847838,
// random date
1395847908
)
)
files.add(
@ -46,8 +48,10 @@ class TrashbinLocalRepository(private val testCase: TrashbinActivityIT.TestCase)
"image/jpeg",
"/trashbin/image.jpg",
"image.jpg",
1395841858, // random date
1395837858 // random date
// random date
1395841858,
// random date
1395837858
)
)
files.add(
@ -56,8 +60,10 @@ class TrashbinLocalRepository(private val testCase: TrashbinActivityIT.TestCase)
"DIR",
"/trashbin/folder/",
"folder",
1395347858, // random date
1395849858 // random date
// random date
1395347858,
// random date
1395849858
)
)

3
app/src/androidTest/java/com/owncloud/android/utils/EncryptionUtilsV2IT.kt
View file

@ -290,7 +290,8 @@ class EncryptionUtilsV2IT : EncryptionIT() {
mimeType = MimeType.JPEG
},
EncryptionUtils.generateIV(),
EncryptionUtils.generateUid(), // random string, not real tag
// random string, not real tag
EncryptionUtils.generateUid(),
EncryptionUtils.generateKey(),
metadataFile,
storageManager

6
app/src/gplay/java/com/nextcloud/android/appReview/InAppReviewHelperImpl.kt
View file

@ -85,11 +85,7 @@ class InAppReviewHelperImpl(val appPreferences: AppPreferences) : InAppReviewHel
}
}
private fun launchAppReviewFlow(
manager: ReviewManager,
activity: AppCompatActivity,
reviewInfo: ReviewInfo
) {
private fun launchAppReviewFlow(manager: ReviewManager, activity: AppCompatActivity, reviewInfo: ReviewInfo) {
val flow = manager.launchReviewFlow(activity, reviewInfo)
flow.addOnCompleteListener { _ ->
// The flow has finished. The API does not indicate whether the user

13
app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt
View file

@ -44,7 +44,7 @@ class AssistantViewModel(
private val _taskTypes = MutableStateFlow<List<TaskType>?>(null)
val taskTypes: StateFlow<List<TaskType>?> = _taskTypes
private var _taskList: List<Task>? = null
private var taskList: List<Task>? = null
private val _filteredTaskList = MutableStateFlow<List<Task>?>(null)
val filteredTaskList: StateFlow<List<Task>?> = _filteredTaskList
@ -55,10 +55,7 @@ class AssistantViewModel(
}
@Suppress("MagicNumber")
fun createTask(
input: String,
type: String
) {
fun createTask(input: String, type: String) {
viewModelScope.launch(Dispatchers.IO) {
val result = repository.createTask(input, type)
@ -111,7 +108,7 @@ class AssistantViewModel(
viewModelScope.launch(Dispatchers.IO) {
val result = repository.getTaskList(appId)
if (result.isSuccess) {
_taskList = result.resultData.tasks
taskList = result.resultData.tasks
filterTaskList(_selectedTaskType.value?.id)
@ -157,11 +154,11 @@ class AssistantViewModel(
private fun filterTaskList(taskTypeId: String?) {
if (taskTypeId == null) {
_filteredTaskList.update {
_taskList
taskList
}
} else {
_filteredTaskList.update {
_taskList?.filter { it.type == taskTypeId }
taskList?.filter { it.type == taskTypeId }
}
}

6
app/src/main/java/com/nextcloud/client/assistant/AsssistantScreen.kt
View file

@ -151,11 +151,7 @@ fun AssistantScreen(viewModel: AssistantViewModel, activity: Activity) {
}
@Composable
private fun ScreenState(
state: AssistantViewModel.State,
activity: Activity,
viewModel: AssistantViewModel
) {
private fun ScreenState(state: AssistantViewModel.State, activity: Activity, viewModel: AssistantViewModel) {
val messageId: Int? = when (state) {
is AssistantViewModel.State.Error -> {
state.messageId

5
app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepository.kt
View file

@ -22,10 +22,7 @@ class AssistantRepository(private val client: NextcloudClient) : AssistantReposi
return GetTaskTypesRemoteOperation().execute(client)
}
override fun createTask(
input: String,
type: String
): RemoteOperationResult<Void> {
override fun createTask(input: String, type: String): RemoteOperationResult<Void> {
return CreateTaskRemoteOperation(input, type).execute(client)
}

5
app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepositoryType.kt
View file

@ -14,10 +14,7 @@ import com.owncloud.android.lib.resources.assistant.model.TaskTypes
interface AssistantRepositoryType {
fun getTaskTypes(): RemoteOperationResult<TaskTypes>
fun createTask(
input: String,
type: String
): RemoteOperationResult<Void>
fun createTask(input: String, type: String): RemoteOperationResult<Void>
fun getTaskList(appId: String): RemoteOperationResult<TaskList>

5
app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt
View file

@ -41,10 +41,7 @@ import com.owncloud.android.lib.resources.assistant.model.Task
@OptIn(ExperimentalFoundationApi::class)
@Suppress("LongMethod", "MagicNumber")
@Composable
fun TaskView(
task: Task,
showDeleteTaskAlertDialog: (Long) -> Unit
) {
fun TaskView(task: Task, showDeleteTaskAlertDialog: (Long) -> Unit) {
var showTaskDetailBottomSheet by remember { mutableStateOf(false) }
var showMoreActionsBottomSheet by remember { mutableStateOf(false) }

25
app/src/main/java/com/nextcloud/client/assistant/taskDetail/TaskDetailBottomSheet.kt
View file

@ -55,21 +55,16 @@ fun TaskDetailBottomSheet(task: Task, dismiss: () -> Unit) {
ModalBottomSheet(
modifier = Modifier.padding(top = 32.dp),
containerColor = Color.White,
onDismissRequest = {
dismiss()
},
onDismissRequest = { dismiss() },
sheetState = sheetState
) {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
) {
LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp)) {
stickyHeader {
Row(
modifier = Modifier
.fillMaxWidth()
.background(color = colorResource(id = R.color.light_grey), shape = RoundedCornerShape(8.dp))
modifier = Modifier.fillMaxWidth().background(
color = colorResource(id = R.color.light_grey),
shape = RoundedCornerShape(8.dp)
)
) {
TextInputSelectButton(
Modifier.weight(1f),
@ -95,10 +90,10 @@ fun TaskDetailBottomSheet(task: Task, dismiss: () -> Unit) {
Spacer(modifier = Modifier.height(16.dp))
Column(
modifier = Modifier
.fillMaxSize()
.background(color = colorResource(id = R.color.light_grey), shape = RoundedCornerShape(8.dp))
.padding(16.dp)
modifier = Modifier.fillMaxSize().background(
color = colorResource(id = R.color.light_grey),
shape = RoundedCornerShape(8.dp)
).padding(16.dp)
) {
Text(
text = if (showInput) {

8
app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
View file

@ -71,7 +71,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
companion object {
const val FIRST_ROOM_DB_VERSION = 65
private var INSTANCE: NextcloudDatabase? = null
private var instance: NextcloudDatabase? = null
@JvmStatic
@Suppress("DeprecatedCallableAddReplaceWith")
@ -82,8 +82,8 @@ abstract class NextcloudDatabase : RoomDatabase() {
@JvmStatic
fun getInstance(context: Context, clock: Clock): NextcloudDatabase {
if (INSTANCE == null) {
INSTANCE = Room
if (instance == null) {
instance = Room
.databaseBuilder(context, NextcloudDatabase::class.java, ProviderMeta.DB_NAME)
.allowMainThreadQueries()
.addLegacyMigrations(clock, context)
@ -92,7 +92,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
.fallbackToDestructiveMigration()
.build()
}
return INSTANCE!!
return instance!!
}
}
}

12
app/src/main/java/com/nextcloud/client/database/migrations/DatabaseMigrationUtil.kt
View file

@ -46,11 +46,7 @@ object DatabaseMigrationUtil {
/**
* Utility method to create a new table with the given columns
*/
private fun createNewTable(
database: SupportSQLiteDatabase,
newTableName: String,
columns: Map<String, String>
) {
private fun createNewTable(database: SupportSQLiteDatabase, newTableName: String, columns: Map<String, String>) {
val columnsString = columns.entries.joinToString(",") { "${it.key} ${it.value}" }
database.execSQL("CREATE TABLE $newTableName ($columnsString)")
}
@ -80,11 +76,7 @@ object DatabaseMigrationUtil {
/**
* Utility method to replace an old table with a new one, essentially deleting the old one and renaming the new one
*/
private fun replaceTable(
database: SupportSQLiteDatabase,
tableName: String,
newTableTempName: String
) {
private fun replaceTable(database: SupportSQLiteDatabase, tableName: String, newTableTempName: String) {
database.execSQL("DROP TABLE $tableName")
database.execSQL("ALTER TABLE $newTableTempName RENAME TO $tableName")
}

6
app/src/main/java/com/nextcloud/client/di/FragmentInjector.kt
View file

@ -12,11 +12,7 @@ import androidx.fragment.app.FragmentManager
import dagger.android.support.AndroidSupportInjection
internal class FragmentInjector : FragmentManager.FragmentLifecycleCallbacks() {
override fun onFragmentPreAttached(
fragmentManager: FragmentManager,
fragment: Fragment,
context: Context
) {
override fun onFragmentPreAttached(fragmentManager: FragmentManager, fragment: Fragment, context: Context) {
super.onFragmentPreAttached(fragmentManager, fragment, context)
if (fragment is Injectable) {
try {

6
app/src/main/java/com/nextcloud/client/documentscan/DocumentPageListAdapter.kt
View file

@ -39,10 +39,8 @@ class DocumentPageListAdapter :
}
private class DiffItemCallback : DiffUtil.ItemCallback<String>() {
override fun areItemsTheSame(oldItem: String, newItem: String) =
oldItem == newItem
override fun areItemsTheSame(oldItem: String, newItem: String) = oldItem == newItem
override fun areContentsTheSame(oldItem: String, newItem: String) =
oldItem == newItem
override fun areContentsTheSame(oldItem: String, newItem: String) = oldItem == newItem
}
}

10
app/src/main/java/com/nextcloud/client/documentscan/GeneratePDFUseCase.kt
View file

@ -36,10 +36,7 @@ class GeneratePDFUseCase @Inject constructor(private val logger: Logger) {
/**
* @return `true` if the PDF was generated successfully, `false` otherwise
*/
private fun writePdfToFile(
filePath: String,
document: PdfDocument
): Boolean {
private fun writePdfToFile(filePath: String, document: PdfDocument): Boolean {
return try {
val fileOutputStream = FileOutputStream(filePath)
document.writeTo(fileOutputStream)
@ -52,10 +49,7 @@ class GeneratePDFUseCase @Inject constructor(private val logger: Logger) {
}
}
private fun fillDocumentPages(
document: PdfDocument,
imagePaths: List<String>
) {
private fun fillDocumentPages(document: PdfDocument, imagePaths: List<String>) {
imagePaths.forEach { path ->
val bitmap = BitmapFactory.decodeFile(path)
val pageInfo = PdfDocument.PageInfo.Builder(bitmap.width, bitmap.height, 1).create()

3
app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
View file

@ -112,7 +112,8 @@ class GeneratePdfFromImagesWork(
user,
arrayOf(pdfPath),
arrayOf(uploadPath),
FileUploadWorker.LOCAL_BEHAVIOUR_DELETE, // MIME type will be detected from file name
// MIME type will be detected from file name
FileUploadWorker.LOCAL_BEHAVIOUR_DELETE,
true,
UploadFileOperation.CREATED_BY_USER,
false,

2
app/src/main/java/com/nextcloud/client/etm/pages/EtmAccountsFragment.kt
View file

@ -20,7 +20,7 @@ import com.owncloud.android.databinding.FragmentEtmAccountsBinding
class EtmAccountsFragment : EtmBaseFragment() {
private var _binding: FragmentEtmAccountsBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

2
app/src/main/java/com/nextcloud/client/etm/pages/EtmMigrations.kt
View file

@ -20,7 +20,7 @@ import java.util.Locale
class EtmMigrations : EtmBaseFragment() {
private var _binding: FragmentEtmMigrationsBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

2
app/src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt
View file

@ -20,7 +20,7 @@ import com.owncloud.android.databinding.FragmentEtmPreferencesBinding
class EtmPreferencesFragment : EtmBaseFragment() {
private var _binding: FragmentEtmPreferencesBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

5
app/src/main/java/com/nextcloud/client/integrations/deck/DeckApi.kt
View file

@ -25,8 +25,5 @@ interface DeckApi {
* value otherwise
* @see [Deck Server App](https://apps.nextcloud.com/apps/deck)
*/
fun createForwardToDeckActionIntent(
notification: Notification,
user: User
): Optional<PendingIntent>
fun createForwardToDeckActionIntent(notification: Notification, user: User): Optional<PendingIntent>
}

10
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
View file

@ -100,10 +100,7 @@ class BackgroundJobFactory @Inject constructor(
}
}
private fun createFilesExportWork(
context: Context,
params: WorkerParameters
): ListenableWorker {
private fun createFilesExportWork(context: Context, params: WorkerParameters): ListenableWorker {
return FilesExportWork(
context,
accountManager.user,
@ -113,10 +110,7 @@ class BackgroundJobFactory @Inject constructor(
)
}
private fun createContentObserverJob(
context: Context,
workerParameters: WorkerParameters
): ListenableWorker {
private fun createContentObserverJob(context: Context, workerParameters: WorkerParameters): ListenableWorker {
return ContentObserverWork(
context,
workerParameters,

4
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
View file

@ -409,9 +409,7 @@ internal class BackgroundJobManagerImpl(
workManager.isWorkRunning(JOB_IMMEDIATE_FILES_SYNC + "_" + syncedFolderID)
}
override fun schedulePeriodicFilesSyncJob(
syncedFolderID: Long
) {
override fun schedulePeriodicFilesSyncJob(syncedFolderID: Long) {
val arguments = Data.Builder()
.putLong(FilesSyncWork.SYNCED_FOLDER_ID, syncedFolderID)
.build()

3
app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
View file

@ -250,7 +250,8 @@ class FilesSyncWork(
localPaths,
remotePaths,
uploadAction!!,
true, // create parent folder if not existent
// create parent folder if not existent
true,
UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
needsWifi,
needsCharging,

3
app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadError.kt
View file

@ -8,5 +8,6 @@
package com.nextcloud.client.jobs.download
enum class FileDownloadError {
Failed, Cancelled
Failed,
Cancelled
}

6
app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
View file

@ -81,11 +81,7 @@ class FileDownloadHelper {
backgroundJobManager.cancelFilesDownloadJob(currentUser, currentFile.fileId)
}
fun saveFile(
file: OCFile,
currentDownload: DownloadFileOperation?,
storageManager: FileDataStorageManager?
) {
fun saveFile(file: OCFile, currentDownload: DownloadFileOperation?, storageManager: FileDataStorageManager?) {
val syncDate = System.currentTimeMillis()
file.apply {

5
app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadIntents.kt
View file

@ -22,10 +22,7 @@ import com.owncloud.android.ui.preview.PreviewImageFragment
class FileDownloadIntents(private val context: Context) {
fun newDownloadIntent(
download: DownloadFileOperation,
linkedToRemotePath: String
): Intent {
fun newDownloadIntent(download: DownloadFileOperation, linkedToRemotePath: String): Intent {
return Intent(FileDownloadWorker.getDownloadAddedMessage()).apply {
putExtra(FileDownloadWorker.EXTRA_ACCOUNT_NAME, download.user.accountName)
putExtra(FileDownloadWorker.EXTRA_REMOTE_PATH, download.remotePath)

5
app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt
View file

@ -369,10 +369,7 @@ class FileDownloadWorker(
notificationManager.showNewNotification(text)
}
private fun notifyDownloadResult(
download: DownloadFileOperation,
downloadResult: RemoteOperationResult<*>
) {
private fun notifyDownloadResult(download: DownloadFileOperation, downloadResult: RemoteOperationResult<*>) {
if (downloadResult.isCancelled) {
return
}

10
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
View file

@ -282,17 +282,11 @@ class FileUploadHelper {
cancelAndRestartUploadJob(accountManager.getUser(accountName).get())
}
fun addUploadTransferProgressListener(
listener: OnDatatransferProgressListener,
targetKey: String
) {
fun addUploadTransferProgressListener(listener: OnDatatransferProgressListener, targetKey: String) {
mBoundListeners[targetKey] = listener
}
fun removeUploadTransferProgressListener(
listener: OnDatatransferProgressListener,
targetKey: String
) {
fun removeUploadTransferProgressListener(listener: OnDatatransferProgressListener, targetKey: String) {
if (mBoundListeners[targetKey] === listener) {
mBoundListeners.remove(targetKey)
}

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

@ -269,7 +269,10 @@ class FileUploadWorker(
// Only notify if it is not same file on remote that causes conflict
if (uploadResult.code == ResultCode.SYNC_CONFLICT && FileUploadHelper().isSameFileOnRemote(
uploadFileOperation.user, File(uploadFileOperation.storagePath), uploadFileOperation.remotePath, context
uploadFileOperation.user,
File(uploadFileOperation.storagePath),
uploadFileOperation.remotePath,
context
)
) {
context.showToast(R.string.file_upload_worker_same_file_already_exists)

4
app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
View file

@ -329,7 +329,7 @@ public final class AppPreferencesImpl implements AppPreferences {
userAccountManager.getUser(),
PREF__FOLDER_SORT_ORDER,
folder,
FileSortOrder.sort_a_to_z.name));
FileSortOrder.SORT_A_TO_Z.name));
}
@Override
@ -343,7 +343,7 @@ public final class AppPreferencesImpl implements AppPreferences {
@Override
public FileSortOrder getSortOrderByType(FileSortOrder.Type type) {
return getSortOrderByType(type, FileSortOrder.sort_a_to_z);
return getSortOrderByType(type, FileSortOrder.SORT_A_TO_Z);
}
@Override

4
app/src/main/java/com/nextcloud/client/preferences/SubFolderRule.kt
View file

@ -11,5 +11,7 @@
package com.nextcloud.client.preferences
enum class SubFolderRule {
YEAR_MONTH, YEAR, YEAR_MONTH_DAY
YEAR_MONTH,
YEAR,
YEAR_MONTH_DAY
}

9
app/src/main/java/com/nextcloud/client/utils/IntentUtil.kt
View file

@ -15,23 +15,20 @@ import com.owncloud.android.datamodel.OCFile
object IntentUtil {
@JvmStatic
public fun createSendIntent(context: Context, file: OCFile): Intent =
createBaseSendFileIntent().apply {
public fun createSendIntent(context: Context, file: OCFile): Intent = createBaseSendFileIntent().apply {
action = Intent.ACTION_SEND
type = file.mimeType
putExtra(Intent.EXTRA_STREAM, file.getExposedFileUri(context))
}
@JvmStatic
public fun createSendIntent(context: Context, files: Array<OCFile>): Intent =
createBaseSendFileIntent().apply {
public fun createSendIntent(context: Context, files: Array<OCFile>): Intent = createBaseSendFileIntent().apply {
action = Intent.ACTION_SEND_MULTIPLE
type = getUniqueMimetype(files)
putParcelableArrayListExtra(Intent.EXTRA_STREAM, getExposedFileUris(context, files))
}
private fun createBaseSendFileIntent(): Intent =
Intent().apply {
private fun createBaseSendFileIntent(): Intent = Intent().apply {
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}

6
app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt
View file

@ -6,7 +6,6 @@
*
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
*/
package com.nextcloud.ui
import android.annotation.SuppressLint
@ -55,7 +54,7 @@ class ChooseAccountDialogFragment :
private var currentStatus: Status? = null
private var _binding: DialogChooseAccountBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
@Inject
lateinit var clientFactory: ClientFactory
@ -187,8 +186,7 @@ class ChooseAccountDialogFragment :
*/
companion object {
@JvmStatic
fun newInstance(user: User) =
ChooseAccountDialogFragment().apply {
fun newInstance(user: User) = ChooseAccountDialogFragment().apply {
arguments = Bundle().apply {
putParcelable(ARG_CURRENT_USER_PARAM, user)
}

3
app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt
View file

@ -93,7 +93,8 @@ class ImageDetailFragment : Fragment(), Injectable {
}
nominatimClient = NominatimClient(
getString(R.string.osm_geocoder_url), getString(R.string.osm_geocoder_contact)
getString(R.string.osm_geocoder_url),
getString(R.string.osm_geocoder_contact)
)
return binding.root

6
app/src/main/java/com/nextcloud/ui/composeComponents/bottomSheet/MoreActionsBottomSheet.kt
View file

@ -37,11 +37,7 @@ import kotlinx.coroutines.launch
@SuppressLint("ResourceAsColor")
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MoreActionsBottomSheet(
title: String? = null,
actions: List<Triple<Int, Int, () -> Unit>>,
dismiss: () -> Unit
) {
fun MoreActionsBottomSheet(title: String? = null, actions: List<Triple<Int, Int, () -> Unit>>, dismiss: () -> Unit) {
val sheetState = rememberModalBottomSheetState()
val scope = rememberCoroutineScope()

10
app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
View file

@ -67,7 +67,7 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
private lateinit var viewModel: FileActionsViewModel
private var _binding: FileActionsBottomSheetBinding? = null
private val binding
val binding
get() = _binding!!
private lateinit var componentsGetter: ComponentsGetter
@ -99,9 +99,7 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
return binding.root
}
private fun handleState(
state: FileActionsViewModel.UiState
) {
private fun handleState(state: FileActionsViewModel.UiState) {
toggleLoadingOrContent(state)
when (state) {
is FileActionsViewModel.UiState.LoadedForSingleFile -> {
@ -192,9 +190,7 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
}
}
private fun displayActions(
actions: List<FileAction>
) {
private fun displayActions(actions: List<FileAction>) {
if (binding.fileActionsList.isEmpty()) {
actions.forEach { action ->
val view = inflateActionView(action)

15
app/src/main/java/com/nextcloud/ui/fileactions/FileActionsViewModel.kt
View file

@ -54,10 +54,7 @@ class FileActionsViewModel @Inject constructor(
@IdRes
get() = _clickActionId
fun load(
arguments: Bundle,
componentsGetter: ComponentsGetter
) {
fun load(arguments: Bundle, componentsGetter: ComponentsGetter) {
val files: List<OCFile>? = arguments.getParcelableArrayList(ARG_FILES)
val numberOfAllFiles: Int = arguments.getInt(ARG_ALL_FILES_COUNT, 1)
val isOverflow = arguments.getBoolean(ARG_IS_OVERFLOW, false)
@ -104,17 +101,11 @@ class FileActionsViewModel @Inject constructor(
.getToHide(inSingleFileFragment)
}
private fun getActionsToShow(
additionalFilter: IntArray?,
toHide: List<Int>
) = FileAction.SORTED_VALUES
private fun getActionsToShow(additionalFilter: IntArray?, toHide: List<Int>) = FileAction.SORTED_VALUES
.filter { additionalFilter == null || it.id !in additionalFilter }
.filter { it.id !in toHide }
private fun updateStateLoaded(
files: Collection<OCFile>,
availableActions: List<FileAction>
) {
private fun updateStateLoaded(files: Collection<OCFile>, availableActions: List<FileAction>) {
val state: UiState = when (files.size) {
1 -> {
val file = files.first()

6
app/src/main/java/com/nextcloud/utils/extensions/BundleExtensions.kt
View file

@ -14,7 +14,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
import java.io.Serializable
@Suppress("TopLevelPropertyNaming")
private const val tag = "BundleExtension"
private const val TAG = "BundleExtension"
fun <T : Serializable?> Bundle?.getSerializableArgument(key: String, type: Class<T>): T? {
if (this == null) {
@ -33,7 +33,7 @@ fun <T : Serializable?> Bundle?.getSerializableArgument(key: String, type: Class
}
}
} catch (e: ClassCastException) {
Log_OC.e(tag, e.localizedMessage)
Log_OC.e(TAG, e.localizedMessage)
null
}
}
@ -51,7 +51,7 @@ fun <T : Parcelable?> Bundle?.getParcelableArgument(key: String, type: Class<T>)
this.getParcelable(key)
}
} catch (e: ClassCastException) {
Log_OC.e(tag, e.localizedMessage)
Log_OC.e(TAG, e.localizedMessage)
e.printStackTrace()
null
}

6
app/src/main/java/com/nextcloud/utils/extensions/IntentExtensions.kt
View file

@ -14,7 +14,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
import java.io.Serializable
@Suppress("TopLevelPropertyNaming")
private const val tag = "IntentExtension"
private const val TAG = "IntentExtension"
fun <T : Serializable?> Intent?.getSerializableArgument(key: String, type: Class<T>): T? {
if (this == null) {
@ -33,7 +33,7 @@ fun <T : Serializable?> Intent?.getSerializableArgument(key: String, type: Class
}
}
} catch (e: ClassCastException) {
Log_OC.e(tag, e.localizedMessage)
Log_OC.e(TAG, e.localizedMessage)
null
}
}
@ -51,7 +51,7 @@ fun <T : Parcelable?> Intent?.getParcelableArgument(key: String, type: Class<T>)
this.getParcelableExtra(key)
}
} catch (e: ClassCastException) {
Log_OC.e(tag, e.localizedMessage)
Log_OC.e(TAG, e.localizedMessage)
null
}
}

6
app/src/main/java/com/nextcloud/utils/extensions/OnDataTransferProgressListenerExtensions.kt
View file

@ -10,7 +10,5 @@ package com.nextcloud.utils.extensions
import com.owncloud.android.lib.common.network.OnDatatransferProgressListener
@Suppress("MagicNumber")
fun OnDatatransferProgressListener.getPercent(
totalTransferredSoFar: Long,
totalToTransfer: Long
): Int = ((100.0 * totalTransferredSoFar.toDouble() / totalToTransfer.toDouble()).toInt()).coerceAtMost(100)
fun OnDatatransferProgressListener.getPercent(totalTransferredSoFar: Long, totalToTransfer: Long): Int =
((100.0 * totalTransferredSoFar.toDouble() / totalToTransfer.toDouble()).toInt()).coerceAtMost(100)

5
app/src/main/java/com/nextcloud/utils/view/FastScrollUtils.kt
View file

@ -17,10 +17,7 @@ import javax.inject.Inject
class FastScrollUtils @Inject constructor(private val viewThemeUtils: ViewThemeUtils) {
@JvmOverloads
fun applyFastScroll(
recyclerView: RecyclerView,
viewHelper: FastScroller.ViewHelper? = null
) {
fun applyFastScroll(recyclerView: RecyclerView, viewHelper: FastScroller.ViewHelper? = null) {
val builder =
FastScrollerBuilder(recyclerView).let {
viewThemeUtils.files.themeFastScrollerBuilder(

3
app/src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.kt
View file

@ -33,7 +33,8 @@ class DeepLinkLoginActivity : AuthenticatorActivity(), Injectable {
val loginUrlInfo = parseLoginDataUrl(prefix, it.toString())
val loginText = findViewById<TextView>(R.id.loginInfo)
loginText.text = String.format(
getString(R.string.direct_login_text), loginUrlInfo.username,
getString(R.string.direct_login_text),
loginUrlInfo.username,
loginUrlInfo.serverAddress
)
} catch (e: IllegalArgumentException) {

3
app/src/main/java/com/owncloud/android/datamodel/ForegroundServiceType.kt
View file

@ -18,7 +18,8 @@ import androidx.annotation.RequiresApi
* This wrapper is designed for compatibility on those versions.
*/
enum class ForegroundServiceType {
DataSync, MediaPlayback;
DataSync,
MediaPlayback;
@RequiresApi(Build.VERSION_CODES.Q)
fun getId(): Int {

4
app/src/main/java/com/owncloud/android/datamodel/MediaFolderType.kt
View file

@ -12,7 +12,9 @@ import android.util.SparseArray
* Types of media folder.
*/
enum class MediaFolderType(@JvmField val id: Int) {
CUSTOM(0), IMAGE(1), VIDEO(2);
CUSTOM(0),
IMAGE(1),
VIDEO(2);
companion object {
private val reverseMap = SparseArray<MediaFolderType>(3)

5
app/src/main/java/com/owncloud/android/datamodel/Template.kt
View file

@ -22,7 +22,10 @@ data class Template(
val extension: String
) : Parcelable {
enum class Type {
DOCUMENT, SPREADSHEET, PRESENTATION, UNKNOWN;
DOCUMENT,
SPREADSHEET,
PRESENTATION,
UNKNOWN;
companion object {
@JvmStatic

16
app/src/main/java/com/owncloud/android/media/MediaControlView.kt
View file

@ -227,10 +227,20 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
context,
if (playerControl?.isPlaying == true) {
R.drawable.ic_pause
} else { R.drawable.ic_play }
} else {
R.drawable.ic_play
}
)
binding.forwardBtn.visibility = if (playerControl?.canSeekForward() == true) { VISIBLE } else { INVISIBLE }
binding.rewindBtn.visibility = if (playerControl?.canSeekBackward() == true) { VISIBLE } else { INVISIBLE }
binding.forwardBtn.visibility = if (playerControl?.canSeekForward() == true) {
VISIBLE
} else {
INVISIBLE
}
binding.rewindBtn.visibility = if (playerControl?.canSeekBackward() == true) {
VISIBLE
} else {
INVISIBLE
}
}
private fun doPauseResume() {

8
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View file

@ -254,13 +254,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
private val TAG = ConflictsResolveActivity::class.java.simpleName
@JvmStatic
fun createIntent(
file: OCFile?,
user: User?,
conflictUploadId: Long,
flag: Int?,
context: Context?
): Intent {
fun createIntent(file: OCFile?, user: User?, conflictUploadId: Long, flag: Int?, context: Context?): Intent {
val intent = Intent(context, ConflictsResolveActivity::class.java)
if (flag != null) {
intent.flags = intent.flags or flag

5
app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
View file

@ -475,10 +475,7 @@ open class FolderPickerActivity :
* @param operation Creation operation performed.
* @param result Result of the creation.
*/
private fun onCreateFolderOperationFinish(
operation: CreateFolderOperation,
result: RemoteOperationResult<*>
) {
private fun onCreateFolderOperationFinish(operation: CreateFolderOperation, result: RemoteOperationResult<*>) {
if (result.isSuccess) {
val fileListFragment = listOfFilesFragment
fileListFragment?.onItemClicked(storageManager.getFileByPath(operation.remotePath))

6
app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt
View file

@ -343,11 +343,7 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
}
}
override fun onActionCallback(
isSuccess: Boolean,
notification: Notification,
holder: NotificationViewHolder
) {
override fun onActionCallback(isSuccess: Boolean, notification: Notification, holder: NotificationViewHolder) {
if (isSuccess) {
adapter?.removeNotification(holder)
} else {

6
app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
View file

@ -801,11 +801,7 @@ class SyncedFoldersActivity :
item.setExcludeHidden(excludeHidden)
}
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>,
grantResults: IntArray
) {
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
when (requestCode) {
PermissionUtil.PERMISSIONS_EXTERNAL_STORAGE -> {
// If request is cancelled, result arrays are empty.

2
app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
View file

@ -83,7 +83,7 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
files.addAll(trashbinFiles);
files = preferences.getSortOrderByType(FileSortOrder.Type.trashBinView,
FileSortOrder.sort_new_to_old).sortTrashbinFiles(files);
FileSortOrder.SORT_NEW_TO_OLD).sortTrashbinFiles(files);
notifyDataSetChanged();
}

5
app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt
View file

@ -78,10 +78,7 @@ class UnifiedSearchItemViewHolder(
binding.unifiedSearchItemLayout.setOnClickListener { listInterface.onSearchResultClicked(entry) }
}
private fun getPlaceholder(
entry: SearchResultEntry,
mimetype: String?
): Drawable {
private fun getPlaceholder(entry: SearchResultEntry, mimetype: String?): Drawable {
val drawable = with(entry.icon) {
when {
equals("icon-folder") ->

2
app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalDialog.kt
View file

@ -40,7 +40,7 @@ class AccountRemovalDialog : DialogFragment(), AvatarGenerationListener, Injecta
private var user: User? = null
private lateinit var alertDialog: AlertDialog
private var _binding: AccountRemovalDialogBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

6
app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
View file

@ -80,11 +80,13 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
private var creator: Creator? = null
enum class Type {
DOCUMENT, SPREADSHEET, PRESENTATION
DOCUMENT,
SPREADSHEET,
PRESENTATION
}
private var _binding: ChooseTemplateBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onStart() {
super.onStart()

9
app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt
View file

@ -52,11 +52,7 @@ class SendFilesDialog : BottomSheetDialogFragment(R.layout.send_files_fragment),
}
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
binding = SendFilesFragmentBinding.inflate(inflater, container, false)
setupSendButtonRecyclerView()
@ -102,7 +98,8 @@ class SendFilesDialog : BottomSheetDialogFragment(R.layout.send_files_fragment),
icon = match.loadIcon(requireActivity().packageManager)
label = match.loadLabel(requireActivity().packageManager)
sendButtonData = SendButtonData(
icon, label,
icon,
label,
match.activityInfo.packageName,
match.activityInfo.name
)

3
app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt
View file

@ -200,7 +200,8 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
icon = match.loadIcon(requireActivity().packageManager)
label = match.loadLabel(requireActivity().packageManager)
sendButtonData = SendButtonData(
icon, label,
icon,
label,
match.activityInfo.packageName,
match.activityInfo.name
)

14
app/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.kt
View file

@ -41,7 +41,7 @@ class SortingOrderDialogFragment : DialogFragment(), Injectable {
retainInstance = true
binding = null
currentSortOrderName = requireArguments().getString(KEY_SORT_ORDER, FileSortOrder.sort_a_to_z.name)
currentSortOrderName = requireArguments().getString(KEY_SORT_ORDER, FileSortOrder.SORT_A_TO_Z.name)
}
/**
@ -51,12 +51,12 @@ class SortingOrderDialogFragment : DialogFragment(), Injectable {
*/
private fun setupDialogElements(binding: SortingOrderFragmentBinding) {
val bindings = listOf(
binding.sortByNameAscending to FileSortOrder.sort_a_to_z,
binding.sortByNameDescending to FileSortOrder.sort_z_to_a,
binding.sortByModificationDateAscending to FileSortOrder.sort_old_to_new,
binding.sortByModificationDateDescending to FileSortOrder.sort_new_to_old,
binding.sortBySizeAscending to FileSortOrder.sort_small_to_big,
binding.sortBySizeDescending to FileSortOrder.sort_big_to_small
binding.sortByNameAscending to FileSortOrder.SORT_A_TO_Z,
binding.sortByNameDescending to FileSortOrder.SORT_Z_TO_A,
binding.sortByModificationDateAscending to FileSortOrder.SORT_OLD_TO_NEW,
binding.sortByModificationDateDescending to FileSortOrder.SORT_NEW_TO_OLD,
binding.sortBySizeAscending to FileSortOrder.SORT_SMALL_TO_BIG,
binding.sortBySizeDescending to FileSortOrder.SORT_BIG_TO_SMALL
)
bindings.forEach { (view, sortOrder) ->

4
app/src/main/java/com/owncloud/android/ui/dialog/StoragePermissionDialogFragment.kt
View file

@ -97,7 +97,9 @@ class StoragePermissionDialogFragment : DialogFragment(), Injectable {
@Parcelize
enum class Result : Parcelable {
CANCEL, FULL_ACCESS, MEDIA_READ_ONLY
CANCEL,
FULL_ACCESS,
MEDIA_READ_ONLY
}
companion object {

14
app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt
View file

@ -274,17 +274,17 @@ class SyncedFolderPreferencesDialogFragment : DialogFragment(), Injectable {
private fun checkWritableFolder() {
if (!syncedFolder!!.isEnabled) {
binding?.settingInstantBehaviourContainer?.isEnabled = false
binding?.settingInstantBehaviourContainer?.alpha = alphaDisabled
binding?.settingInstantBehaviourContainer?.alpha = ALPHA_DISABLED
return
}
if (syncedFolder!!.localPath != null && File(syncedFolder!!.localPath).canWrite()) {
binding?.settingInstantBehaviourContainer?.isEnabled = true
binding?.settingInstantBehaviourContainer?.alpha = alphaEnabled
binding?.settingInstantBehaviourContainer?.alpha = ALPHA_ENABLED
binding?.settingInstantBehaviourSummary?.text =
uploadBehaviorItemStrings[syncedFolder!!.uploadActionInteger]
} else {
binding?.settingInstantBehaviourContainer?.isEnabled = false
binding?.settingInstantBehaviourContainer?.alpha = alphaDisabled
binding?.settingInstantBehaviourContainer?.alpha = ALPHA_DISABLED
syncedFolder?.setUploadAction(
resources.getTextArray(R.array.pref_behaviour_entryValues)[0].toString()
)
@ -294,9 +294,9 @@ class SyncedFolderPreferencesDialogFragment : DialogFragment(), Injectable {
private fun setupViews(optionalBinding: SyncedFoldersSettingsLayoutBinding?, enable: Boolean) {
val alpha: Float = if (enable) {
alphaEnabled
ALPHA_ENABLED
} else {
alphaDisabled
ALPHA_DISABLED
}
optionalBinding?.let { binding ->
@ -518,8 +518,8 @@ class SyncedFolderPreferencesDialogFragment : DialogFragment(), Injectable {
private val TAG = SyncedFolderPreferencesDialogFragment::class.java.simpleName
private const val BEHAVIOUR_DIALOG_STATE = "BEHAVIOUR_DIALOG_STATE"
private const val NAME_COLLISION_POLICY_DIALOG_STATE = "NAME_COLLISION_POLICY_DIALOG_STATE"
private const val alphaEnabled = 1.0f
private const val alphaDisabled = 0.7f
private const val ALPHA_ENABLED = 1.0f
private const val ALPHA_DISABLED = 0.7f
@JvmStatic
fun newInstance(syncedFolder: SyncedFolderDisplayItem?, section: Int): SyncedFolderPreferencesDialogFragment? {

8
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
View file

@ -91,8 +91,12 @@ class FileDetailsSharingProcessFragment :
* fragment instance to be called while modifying existing share information
*/
@JvmStatic
fun newInstance(share: OCShare, screenType: Int, isReshareShown: Boolean, isExpirationDateShown: Boolean):
FileDetailsSharingProcessFragment {
fun newInstance(
share: OCShare,
screenType: Int,
isReshareShown: Boolean,
isExpirationDateShown: Boolean
): FileDetailsSharingProcessFragment {
val args = Bundle()
args.putParcelable(ARG_OCSHARE, share)
args.putInt(ARG_SCREEN_TYPE, screenType)

2
app/src/main/java/com/owncloud/android/ui/fragment/ProfileBottomSheetDialog.kt
View file

@ -40,7 +40,7 @@ class ProfileBottomSheetDialog(
private var _binding: ProfileBottomSheetFragmentBinding? = null
// This property is only valid between onCreateView and onDestroyView.
private val binding get() = _binding!!
val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

2
app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt
View file

@ -59,7 +59,7 @@ class UnifiedSearchFragment :
UnifiedSearchItemViewHolder.FilesAction {
private lateinit var adapter: UnifiedSearchListAdapter
private var _binding: ListFragmentBinding? = null
private val binding get() = _binding!!
val binding get() = _binding!!
private var searchView: SearchView? = null
lateinit var vm: IUnifiedSearchViewModel

15
app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
View file

@ -53,7 +53,11 @@ class UriUploader(
) {
enum class UriUploaderResultCode {
OK, ERROR_UNKNOWN, ERROR_NO_FILE_TO_UPLOAD, ERROR_READ_PERMISSION_NOT_GRANTED, ERROR_SENSITIVE_PATH
OK,
ERROR_UNKNOWN,
ERROR_NO_FILE_TO_UPLOAD,
ERROR_READ_PERMISSION_NOT_GRANTED,
ERROR_SENSITIVE_PATH
}
fun uploadUris(): UriUploaderResultCode {
@ -121,11 +125,12 @@ class UriUploader(
arrayOf(localPath ?: ""),
arrayOf(remotePath),
mBehaviour,
false, // do not create parent folder if not existent
// do not create parent folder if not existent
false,
UploadFileOperation.CREATED_BY_USER,
false,
false,
NameCollisionPolicy.ASK_USER
requiresWifi = false,
requiresCharging = false,
nameCollisionPolicy = NameCollisionPolicy.ASK_USER
)
}

5
app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfFragment.kt
View file

@ -86,7 +86,7 @@ class PreviewPdfFragment : Fragment(), Injectable {
requireContext().startActivity(intent)
}
}
viewModel.shouldShowZoomTip.observe(viewLifecycleOwner) { shouldShow ->
viewModel.showZoomTip.observe(viewLifecycleOwner) { shouldShow ->
if (shouldShow) {
snack = DisplayUtils.showSnackMessage(binding.root, R.string.pdf_zoom_tip)
viewModel.onZoomTipShown()
@ -100,8 +100,7 @@ class PreviewPdfFragment : Fragment(), Injectable {
setHasOptionsMenu(true)
}
private fun getScreenWidth(): Int =
requireContext().resources.displayMetrics.widthPixels
private fun getScreenWidth(): Int = requireContext().resources.displayMetrics.widthPixels
override fun onPrepareOptionsMenu(menu: Menu) {
super.onPrepareOptionsMenu(menu)

2
app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfViewModel.kt
View file

@ -36,7 +36,7 @@ class PreviewPdfViewModel @Inject constructor(val appPreferences: AppPreferences
get() = _previewImagePath
private var _showZoomTip = MutableLiveData<Boolean>()
val shouldShowZoomTip: LiveData<Boolean>
val showZoomTip: LiveData<Boolean>
get() = _showZoomTip
override fun onCleared() {

8
app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt
View file

@ -159,7 +159,7 @@ class TrashbinActivity :
supportFragmentManager,
preferences?.getSortOrderByType(
FileSortOrder.Type.trashBinView,
FileSortOrder.sort_new_to_old
FileSortOrder.SORT_NEW_TO_OLD
)
)
}
@ -247,10 +247,10 @@ class TrashbinActivity :
onBackPressedCallback.isEnabled = !isRoot
}
override fun onSortingOrderChosen(sortOrder: FileSortOrder?) {
override fun onSortingOrderChosen(selection: FileSortOrder?) {
val sortButton = findViewById<TextView>(R.id.sort_button)
sortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder))
trashbinListAdapter?.setSortOrder(sortOrder)
sortButton.setText(DisplayUtils.getSortOrderStringId(selection))
trashbinListAdapter?.setSortOrder(selection)
}
override fun showTrashbinFolder(trashbinFiles: List<TrashbinFile?>?) {

24
app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
View file

@ -110,12 +110,12 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import static com.owncloud.android.ui.dialog.SortingOrderDialogFragment.SORTING_ORDER_FRAGMENT;
import static com.owncloud.android.utils.FileSortOrder.sort_a_to_z_id;
import static com.owncloud.android.utils.FileSortOrder.sort_big_to_small_id;
import static com.owncloud.android.utils.FileSortOrder.sort_new_to_old_id;
import static com.owncloud.android.utils.FileSortOrder.sort_old_to_new_id;
import static com.owncloud.android.utils.FileSortOrder.sort_small_to_big_id;
import static com.owncloud.android.utils.FileSortOrder.sort_z_to_a_id;
import static com.owncloud.android.utils.FileSortOrder.SORT_A_TO_Z_ID;
import static com.owncloud.android.utils.FileSortOrder.SORT_BIG_TO_SMALL_ID;
import static com.owncloud.android.utils.FileSortOrder.SORT_NEW_TO_OLD_ID;
import static com.owncloud.android.utils.FileSortOrder.SORT_OLD_TO_NEW_ID;
import static com.owncloud.android.utils.FileSortOrder.SORT_SMALL_TO_BIG_ID;
import static com.owncloud.android.utils.FileSortOrder.SORT_Z_TO_A_ID;
/**
* A helper class for UI/display related operations.
@ -819,17 +819,17 @@ public final class DisplayUtils {
public static @StringRes int getSortOrderStringId(FileSortOrder sortOrder) {
switch (sortOrder.name) {
case sort_z_to_a_id:
case SORT_Z_TO_A_ID:
return R.string.menu_item_sort_by_name_z_a;
case sort_new_to_old_id:
case SORT_NEW_TO_OLD_ID:
return R.string.menu_item_sort_by_date_newest_first;
case sort_old_to_new_id:
case SORT_OLD_TO_NEW_ID:
return R.string.menu_item_sort_by_date_oldest_first;
case sort_big_to_small_id:
case SORT_BIG_TO_SMALL_ID:
return R.string.menu_item_sort_by_size_biggest_first;
case sort_small_to_big_id:
case SORT_SMALL_TO_BIG_ID:
return R.string.menu_item_sort_by_size_smallest_first;
case sort_a_to_z_id:
case SORT_A_TO_Z_ID:
default:
return R.string.menu_item_sort_by_name_a_z;
}

17
app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt
View file

@ -196,7 +196,8 @@ class EncryptionUtilsV2 {
DecryptedFolderMetadataFile(
decryptedMetadata,
mutableListOf(), // subfolder do not store user array
// subfolder do not store user array
mutableListOf(),
mutableMapOf()
)
} else {
@ -530,20 +531,13 @@ class EncryptionUtilsV2 {
}
@Throws(IllegalStateException::class)
fun removeFileFromMetadata(
fileName: String,
metadata: DecryptedFolderMetadataFile
) {
fun removeFileFromMetadata(fileName: String, metadata: DecryptedFolderMetadataFile) {
metadata.metadata.files.remove(fileName)
?: throw IllegalStateException("File $fileName not found in metadata!")
}
@Throws(IllegalStateException::class)
fun renameFile(
key: String,
newName: String,
metadataFile: DecryptedFolderMetadataFile
) {
fun renameFile(key: String, newName: String, metadataFile: DecryptedFolderMetadataFile) {
if (!metadataFile.metadata.files.containsKey(key)) {
throw IllegalStateException("File with key $key not found in metadata!")
}
@ -956,7 +950,8 @@ class EncryptionUtilsV2 {
encryptedFolderMetadataFile: EncryptedFolderMetadataFile,
decryptedFolderMetadataFile: DecryptedFolderMetadataFile,
oldCounter: Long,
ans: String // base 64 encoded BER
// base 64 encoded BER
ans: String
) {
// check counter
if (decryptedFolderMetadataFile.metadata.counter < oldCounter) {

8
app/src/main/java/com/owncloud/android/utils/FileExportUtils.kt
View file

@ -25,13 +25,7 @@ import java.io.InputStream
class FileExportUtils {
@Throws(IllegalStateException::class)
fun exportFile(
fileName: String,
mimeType: String,
contentResolver: ContentResolver,
ocFile: OCFile?,
file: File?
) {
fun exportFile(fileName: String, mimeType: String, contentResolver: ContentResolver, ocFile: OCFile?, file: File?) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
exportFileAndroid10AndAbove(
fileName,

52
app/src/main/java/com/owncloud/android/utils/FileSortOrder.kt
View file

@ -29,44 +29,46 @@ open class FileSortOrder(@JvmField var name: String, var isAscending: Boolean) {
}
enum class SortType {
SIZE, ALPHABET, DATE
SIZE,
ALPHABET,
DATE
}
companion object {
const val sort_a_to_z_id = "sort_a_to_z"
const val sort_z_to_a_id = "sort_z_to_a"
const val sort_old_to_new_id = "sort_old_to_new"
const val sort_new_to_old_id = "sort_new_to_old"
const val sort_small_to_big_id = "sort_small_to_big"
const val sort_big_to_small_id = "sort_big_to_small"
const val SORT_A_TO_Z_ID = "sort_a_to_z"
const val SORT_Z_TO_A_ID = "sort_z_to_a"
const val SORT_OLD_TO_NEW_ID = "sort_old_to_new"
const val SORT_NEW_TO_OLD_ID = "sort_new_to_old"
const val SORT_SMALL_TO_BIG_ID = "sort_small_to_big"
const val SORT_BIG_TO_SMALL_ID = "sort_big_to_small"
@JvmField
val sort_a_to_z: FileSortOrder = FileSortOrderByName(sort_a_to_z_id, true)
val SORT_A_TO_Z: FileSortOrder = FileSortOrderByName(SORT_A_TO_Z_ID, true)
@JvmField
val sort_z_to_a: FileSortOrder = FileSortOrderByName(sort_z_to_a_id, false)
val SORT_Z_TO_A: FileSortOrder = FileSortOrderByName(SORT_Z_TO_A_ID, false)
@JvmField
val sort_old_to_new: FileSortOrder = FileSortOrderByDate(sort_old_to_new_id, true)
val SORT_OLD_TO_NEW: FileSortOrder = FileSortOrderByDate(SORT_OLD_TO_NEW_ID, true)
@JvmField
val sort_new_to_old: FileSortOrder = FileSortOrderByDate(sort_new_to_old_id, false)
val SORT_NEW_TO_OLD: FileSortOrder = FileSortOrderByDate(SORT_NEW_TO_OLD_ID, false)
@JvmField
val sort_small_to_big: FileSortOrder = FileSortOrderBySize(sort_small_to_big_id, true)
val SORT_SMALL_TO_BIG: FileSortOrder = FileSortOrderBySize(SORT_SMALL_TO_BIG_ID, true)
@JvmField
val sort_big_to_small: FileSortOrder = FileSortOrderBySize(sort_big_to_small_id, false)
val SORT_BIG_TO_SMALL: FileSortOrder = FileSortOrderBySize(SORT_BIG_TO_SMALL_ID, false)
@JvmField
val sortOrders: Map<String, FileSortOrder> = Collections.unmodifiableMap(
mapOf(
sort_a_to_z.name to sort_a_to_z,
sort_z_to_a.name to sort_z_to_a,
sort_old_to_new.name to sort_old_to_new,
sort_new_to_old.name to sort_new_to_old,
sort_small_to_big.name to sort_small_to_big,
sort_big_to_small.name to sort_big_to_small
SORT_A_TO_Z.name to SORT_A_TO_Z,
SORT_Z_TO_A.name to SORT_Z_TO_A,
SORT_OLD_TO_NEW.name to SORT_OLD_TO_NEW,
SORT_NEW_TO_OLD.name to SORT_NEW_TO_OLD,
SORT_SMALL_TO_BIG.name to SORT_SMALL_TO_BIG,
SORT_BIG_TO_SMALL.name to SORT_BIG_TO_SMALL
)
)
@ -103,14 +105,14 @@ open class FileSortOrder(@JvmField var name: String, var isAscending: Boolean) {
open fun getType(): SortType {
return when (name) {
sort_z_to_a_id,
sort_a_to_z_id -> SortType.ALPHABET
SORT_Z_TO_A_ID,
SORT_A_TO_Z_ID -> SortType.ALPHABET
sort_small_to_big_id,
sort_big_to_small_id -> SortType.SIZE
SORT_SMALL_TO_BIG_ID,
SORT_BIG_TO_SMALL_ID -> SortType.SIZE
sort_new_to_old_id,
sort_old_to_new_id -> SortType.DATE
SORT_NEW_TO_OLD_ID,
SORT_OLD_TO_NEW_ID -> SortType.DATE
else -> SortType.ALPHABET
}

4
app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
View file

@ -108,9 +108,7 @@ class FilesSpecificViewThemeUtils @Inject constructor(
}
}
private fun getThumbDrawable(
context: Context
): Drawable {
private fun getThumbDrawable(context: Context): Drawable {
val thumbDrawable =
ResourcesCompat.getDrawable(
context.resources,

2
app/src/test/java/com/nextcloud/client/utils/OCFileSortTest.kt
View file

@ -33,7 +33,7 @@ class OCFileSortTest {
fun testFileSortOrder() {
val toSort = getShuffledList()
FileSortOrder.sort_a_to_z.sortCloudFiles(toSort)
FileSortOrder.SORT_A_TO_Z.sortCloudFiles(toSort)
verifySort(toSort)
}