Browse Source

Fix previously undetected ktlint issues

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
41a3a06a53
45 changed files with 121 additions and 94 deletions
  1. 2 1
      app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt
  2. 5 5
      app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt
  3. 2 2
      app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt
  4. 0 2
      app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt
  5. 5 2
      app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt
  6. 2 2
      app/src/androidTest/java/com/owncloud/android/providers/FileContentProviderVerificationIT.kt
  7. 21 22
      app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
  8. 0 1
      app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewBitmapScreenshotIT.kt
  9. 7 7
      app/src/main/java/com/nextcloud/client/di/ThemeModule.kt
  10. 0 1
      app/src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt
  11. 2 2
      app/src/main/java/com/nextcloud/client/files/downloader/Request.kt
  12. 1 1
      app/src/main/java/com/nextcloud/client/files/downloader/UploadTask.kt
  13. 0 1
      app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
  14. 0 2
      app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
  15. 0 1
      app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt
  16. 1 0
      app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt
  17. 1 1
      app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt
  18. 0 1
      app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt
  19. 7 2
      app/src/main/java/com/nextcloud/utils/view/FastScrollPopupBackground.kt
  20. 3 3
      app/src/main/java/com/owncloud/android/datamodel/ContentResolverHelper.kt
  21. 0 1
      app/src/main/java/com/owncloud/android/datamodel/SignatureVerification.kt
  22. 1 0
      app/src/main/java/com/owncloud/android/ui/NextcloudWebViewClient.kt
  23. 9 4
      app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
  24. 5 2
      app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
  25. 2 3
      app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
  26. 0 1
      app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt
  27. 1 1
      app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt
  28. 6 2
      app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt
  29. 3 1
      app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
  30. 4 2
      app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
  31. 9 3
      app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt
  32. 4 1
      app/src/main/java/com/owncloud/android/ui/fragment/util/GalleryFastScrollViewHelper.kt
  33. 0 1
      app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt
  34. 3 1
      app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfAdapter.kt
  35. 0 1
      app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
  36. 2 2
      app/src/main/java/com/owncloud/android/utils/FileSortOrder.kt
  37. 0 1
      app/src/main/java/com/owncloud/android/utils/FileSortOrderBySize.kt
  38. 4 2
      app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
  39. 2 1
      app/src/main/java/com/owncloud/android/utils/UriUtils.kt
  40. 4 0
      app/src/test/java/com/nextcloud/client/core/TaskTest.kt
  41. 0 1
      app/src/test/java/com/nextcloud/client/logger/LoggerTest.kt
  42. 1 1
      app/src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt
  43. 1 1
      app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt
  44. 0 1
      app/src/test/java/com/nextcloud/client/utils/ThrottlerTest.kt
  45. 1 1
      app/src/test/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverterTest.kt

+ 2 - 1
app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt

@@ -64,8 +64,9 @@ class RetryTestRule(val retryCount: Int = defaultRetryValue) : TestRule {
                 }
 
                 Log_OC.e(TAG, description.methodName + ": giving up after " + retryCount + " failures")
-                if (caughtThrowable != null)
+                if (caughtThrowable != null) {
                     throw caughtThrowable
+                }
             }
         }
     }

+ 5 - 5
app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt

@@ -22,13 +22,13 @@
 package com.nextcloud.client
 
 import android.app.Activity
-import com.owncloud.android.AbstractIT
-import androidx.test.espresso.intent.rule.IntentsTestRule
-import com.owncloud.android.ui.activity.SettingsActivity
-import android.os.Looper
 import android.content.Intent
-import com.owncloud.android.ui.activity.RequestCredentialsActivity
+import android.os.Looper
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import com.owncloud.android.AbstractIT
 import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.ui.activity.RequestCredentialsActivity
+import com.owncloud.android.ui.activity.SettingsActivity
 import com.owncloud.android.utils.EncryptionUtils
 import com.owncloud.android.utils.ScreenshotTest
 import org.junit.Assert

+ 2 - 2
app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt

@@ -19,12 +19,12 @@
  */
 package com.nextcloud.client.migrations
 
-import org.junit.Before
-import org.junit.Test
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotSame
 import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
 
 @Suppress("MagicNumber")
 class MockSharedPreferencesTest {

+ 0 - 2
app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt

@@ -59,7 +59,6 @@ class ContentResolverHelperIT {
     @Test
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
     fun contentResolver_onAndroid26_usesNewAPI() {
-
         ContentResolverHelper
             .queryResolver(resolver, URI, PROJECTION, SELECTION, null, SORT_COLUMN, SORT_DIRECTION, LIMIT)
 
@@ -80,7 +79,6 @@ class ContentResolverHelperIT {
     @Test
     @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.N_MR1)
     fun contentResolver_onAndroidBelow26_usesOldAPI() {
-
         ContentResolverHelper
             .queryResolver(resolver, URI, PROJECTION, SELECTION, null, SORT_COLUMN, SORT_DIRECTION, LIMIT)
 

+ 5 - 2
app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt

@@ -184,8 +184,11 @@ object DocumentsProviderUtils {
                             override fun onChange(selfChange: Boolean, uri: Uri?) {
                                 cursor.close()
                                 val newCursor = query()
-                                if (newCursor == null) cont.cancel(IOException("Re-query returned no results"))
-                                else cont.resume(newCursor)
+                                if (newCursor == null) {
+                                    cont.cancel(IOException("Re-query returned no results"))
+                                } else {
+                                    cont.resume(newCursor)
+                                }
                             }
                         }
                     )

+ 2 - 2
app/src/androidTest/java/com/owncloud/android/providers/FileContentProviderVerificationIT.kt

@@ -21,11 +21,11 @@
  */
 package com.owncloud.android.providers
 
-import java.lang.IllegalArgumentException
-import com.owncloud.android.db.ProviderMeta
 import android.content.ContentValues
+import com.owncloud.android.db.ProviderMeta
 import com.owncloud.android.utils.MimeTypeUtil
 import org.junit.Test
+import java.lang.IllegalArgumentException
 
 @Suppress("FunctionNaming")
 class FileContentProviderVerificationIT {

+ 21 - 22
app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt

@@ -54,9 +54,9 @@ import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.fragment.util.SharingMenuHelper
 import com.owncloud.android.utils.ScreenshotTest
-import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.anyOf
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.not
 import org.junit.After
 import org.junit.Assert.assertFalse
@@ -107,12 +107,12 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         show(file)
     }
 
-    @Test
-    @ScreenshotTest
-    @Suppress("MagicNumber")
     /**
      * Use same values as {@link OCFileListFragmentStaticServerIT showSharedFiles }
      */
+    @Test
+    @ScreenshotTest
+    @Suppress("MagicNumber")
     fun listSharesFileAllShareTypes() {
         OCShare(file.decryptedRemotePath).apply {
             remoteId = 1
@@ -230,10 +230,10 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         screenshot(activity)
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // public link and email are handled the same way
     // for advanced permissions
+    @Test
+    @Suppress("MagicNumber")
     fun publicLinkOptionMenuFolderAdvancePermission() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -327,10 +327,10 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         onView(ViewMatchers.withId(R.id.share_process_select_exp_date)).check(matches(withText("")))
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // public link and email are handled the same way
     // for send new email
+    @Test
+    @Suppress("MagicNumber")
     fun publicLinkOptionMenuFolderSendNewEmail() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -359,10 +359,10 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         )
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // public link and email are handled the same way
     // for advanced permissions
+    @Test
+    @Suppress("MagicNumber")
     fun publicLinkOptionMenuFileAdvancePermission() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -447,10 +447,10 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         onView(ViewMatchers.withId(R.id.share_process_select_exp_date)).check(matches(withText("")))
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // public link and email are handled the same way
     // for send new email
+    @Test
+    @Suppress("MagicNumber")
     fun publicLinkOptionMenuFileSendNewEmail() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -467,14 +467,14 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         verifySendNewEmail(sut, publicShare)
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // also applies for
     // group
     // conversation
     // circle
     // federated share
     // for advanced permissions
+    @Test
+    @Suppress("MagicNumber")
     fun userOptionMenuFileAdvancePermission() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         suppressFDFAccessibilityChecks()
@@ -557,7 +557,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
                 allOf(
                     anyOf(
                         matchesCheckNames(`is`("TouchTargetSizeCheck")),
-                        matchesCheckNames(`is`("SpeakableTextPresentCheck")),
+                        matchesCheckNames(`is`("SpeakableTextPresentCheck"))
                     ),
                     anyOf(
                         matchesViews(ViewMatchers.withId(R.id.favorite)),
@@ -568,14 +568,14 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         }
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // also applies for
     // group
     // conversation
     // circle
     // federated share
     // for send new email
+    @Test
+    @Suppress("MagicNumber")
     fun userOptionMenuFileSendNewEmail() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -592,14 +592,14 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         verifySendNewEmail(sut, userShare)
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // also applies for
     // group
     // conversation
     // circle
     // federated share
     // for advanced permissions
+    @Test
+    @Suppress("MagicNumber")
     fun userOptionMenuFolderAdvancePermission() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -709,14 +709,14 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         waitForIdleSync()
     }
 
-    @Test
-    @Suppress("MagicNumber")
     // also applies for
     // group
     // conversation
     // circle
     // federated share
     // for send new email
+    @Test
+    @Suppress("MagicNumber")
     fun userOptionMenuFolderSendNewEmail() {
         val sut = FileDetailSharingFragment.newInstance(file, user)
         activity.addFragment(sut)
@@ -752,7 +752,6 @@ class FileDetailSharingFragmentIT : AbstractIT() {
 
     @Test
     fun testUploadAndEditingSharePermissions() {
-
         val share = OCShare().apply {
             permissions = MAXIMUM_PERMISSIONS_FOR_FOLDER
         }

+ 0 - 1
app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewBitmapScreenshotIT.kt

@@ -40,7 +40,6 @@ class PreviewBitmapScreenshotIT : AbstractIT() {
     @Test
     @ScreenshotTest
     fun showBitmap() {
-
         val pngFile = getFile(PNG_FILE_ASSET)
 
         val activity = testActivityRule.launchActivity(

+ 7 - 7
app/src/main/java/com/nextcloud/client/di/ThemeModule.kt

@@ -21,23 +21,23 @@
 package com.nextcloud.client.di
 
 import android.content.Context
-import javax.inject.Singleton
+import com.owncloud.android.utils.theme.ThemeAvatarUtils
+import com.owncloud.android.utils.theme.ThemeBarUtils
+import com.owncloud.android.utils.theme.ThemeButtonUtils
+import com.owncloud.android.utils.theme.ThemeCheckableUtils
 import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.ThemeDrawableUtils
 import com.owncloud.android.utils.theme.ThemeFabUtils
 import com.owncloud.android.utils.theme.ThemeLayoutUtils
-import com.owncloud.android.utils.theme.ThemeTextInputUtils
-import com.owncloud.android.utils.theme.ThemeToolbarUtils
 import com.owncloud.android.utils.theme.ThemeMenuUtils
 import com.owncloud.android.utils.theme.ThemeSnackbarUtils
+import com.owncloud.android.utils.theme.ThemeTextInputUtils
 import com.owncloud.android.utils.theme.ThemeTextUtils
-import com.owncloud.android.utils.theme.ThemeButtonUtils
-import com.owncloud.android.utils.theme.ThemeBarUtils
-import com.owncloud.android.utils.theme.ThemeCheckableUtils
-import com.owncloud.android.utils.theme.ThemeAvatarUtils
+import com.owncloud.android.utils.theme.ThemeToolbarUtils
 import com.owncloud.android.utils.theme.ThemeUtils
 import dagger.Module
 import dagger.Provides
+import javax.inject.Singleton
 
 @Module
 internal class ThemeModule {

+ 0 - 1
app/src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt

@@ -42,7 +42,6 @@ class ExceptionHandler(
     }
 
     override fun uncaughtException(thread: Thread, exception: Throwable) {
-
         @Suppress("TooGenericExceptionCaught") // this is exactly what we want here
         try {
             val errorReport = generateErrorReport(formatException(thread, exception))

+ 2 - 2
app/src/main/java/com/nextcloud/client/files/downloader/Request.kt

@@ -59,7 +59,7 @@ class DownloadRequest internal constructor(
 
     constructor(
         user: User,
-        file: OCFile,
+        file: OCFile
     ) : this(user, file, UUID.randomUUID(), Direction.DOWNLOAD)
 
     constructor(
@@ -106,7 +106,7 @@ class UploadRequest internal constructor(
     val upload: OCUpload,
     uuid: UUID,
     type: Direction,
-    test: Boolean,
+    test: Boolean
 ) : Request(user, file, uuid, type, test) {
 
     constructor(

+ 1 - 1
app/src/main/java/com/nextcloud/client/files/downloader/UploadTask.kt

@@ -38,7 +38,7 @@ class UploadTask(
     private val connectivityService: ConnectivityService,
     private val powerManagementService: PowerManagementService,
     private val clientProvider: () -> OwnCloudClient,
-    private val fileDataStorageManager: FileDataStorageManager,
+    private val fileDataStorageManager: FileDataStorageManager
 ) {
 
     data class Result(val file: OCFile, val success: Boolean)

+ 0 - 1
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt

@@ -79,7 +79,6 @@ class BackgroundJobFactory @Inject constructor(
         workerClassName: String,
         workerParameters: WorkerParameters
     ): ListenableWorker? {
-
         val workerClass = try {
             Class.forName(workerClassName).kotlin
         } catch (ex: ClassNotFoundException) {

+ 0 - 2
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt

@@ -258,7 +258,6 @@ internal class BackgroundJobManagerImpl(
         vCardFilePath: String,
         selectedContacts: IntArray
     ): LiveData<JobInfo?> {
-
         val data = Data.Builder()
             .putString(ContactsImportWork.ACCOUNT_NAME, contactsAccountName)
             .putString(ContactsImportWork.ACCOUNT_TYPE, contactsAccountType)
@@ -281,7 +280,6 @@ internal class BackgroundJobManagerImpl(
     }
 
     override fun startImmediateCalendarImport(calendarPaths: Map<String, Int>): LiveData<JobInfo?> {
-
         val data = Data.Builder()
             .putAll(calendarPaths)
             .build()

+ 0 - 1
app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt

@@ -59,7 +59,6 @@ class CalendarBackupWork(
 
         val force = inputData.getBoolean(FORCE, false)
         if (force || lastExecution + JOB_INTERVAL_MS < Calendar.getInstance().timeInMillis) {
-
             AndroidCalendar.loadAll(contentResolver).forEach { calendar ->
                 SaveCalendar(
                     applicationContext,

+ 1 - 0
app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt

@@ -40,6 +40,7 @@ class LogsActivity : ToolbarActivity() {
 
     @Inject
     protected lateinit var viewModelFactory: ViewModelFactory
+
     @Inject
     protected lateinit var themeBarUtils: ThemeBarUtils
     private lateinit var vm: LogsViewModel

+ 1 - 1
app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt

@@ -110,7 +110,7 @@ internal class PlayerStateMachine(initialState: State, private val delegate: Del
         FOCUS_LOST,
         FOCUS_GAIN,
         FOCUS_DUCK,
-        IMMEDIATE_TRANSITION,
+        IMMEDIATE_TRANSITION
     }
 
     private var pendingEvents = ArrayDeque<Event>()

+ 0 - 1
app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt

@@ -45,7 +45,6 @@ internal class MigrationsManagerImpl(
     @Throws(MigrationError::class)
     @Suppress("ReturnCount")
     override fun startMigration(): Int {
-
         if (migrationsDb.isFailed) {
             (status as MutableLiveData<Status>).value = Status.FAILED
             return 0

+ 7 - 2
app/src/main/java/com/nextcloud/utils/view/FastScrollPopupBackground.kt

@@ -156,8 +156,13 @@ class FastScrollPopupBackground(context: Context, @ColorInt color: Int) : Drawab
             sweepAngle: Float
         ) {
             path.arcTo(
-                centerX - radius, centerY - radius, centerX + radius, centerY + radius,
-                startAngle, sweepAngle, false
+                centerX - radius,
+                centerY - radius,
+                centerX + radius,
+                centerY + radius,
+                startAngle,
+                sweepAngle,
+                false
             )
         }
     }

+ 3 - 3
app/src/main/java/com/owncloud/android/datamodel/ContentResolverHelper.kt

@@ -32,13 +32,13 @@ object ContentResolverHelper {
     const val SORT_DIRECTION_ASCENDING = "ASC"
     const val SORT_DIRECTION_DESCENDING = "DESC"
 
-    @JvmStatic
-    @JvmOverloads
-    @Suppress("LongParameterList")
     /**
      * Queries the content resolver with the given params using the correct API level-dependant syntax.
      * This is needed in order to use LIMIT or OFFSET from android 11.
      */
+    @JvmStatic
+    @JvmOverloads
+    @Suppress("LongParameterList")
     fun queryResolver(
         contentResolver: ContentResolver,
         uri: Uri,

+ 0 - 1
app/src/main/java/com/owncloud/android/datamodel/SignatureVerification.kt

@@ -21,7 +21,6 @@ package com.owncloud.android.datamodel
 
 import android.accounts.Account
 import android.os.Parcelable
-
 import kotlinx.parcelize.Parcelize
 
 @Parcelize

+ 1 - 0
app/src/main/java/com/owncloud/android/ui/NextcloudWebViewClient.kt

@@ -58,6 +58,7 @@ open class NextcloudWebViewClient(val supportFragmentManager: FragmentManager) :
         }
         return x509Certificate
     }
+
     /**
      * Show untrusted cert dialog
      */

+ 9 - 4
app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -410,7 +410,8 @@ open class FolderPickerActivity :
         } else {
             try {
                 DisplayUtils.showSnackMessage(
-                    this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
+                    this,
+                    ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
                 )
             } catch (e: Resources.NotFoundException) {
                 Log_OC.e(TAG, "Error while trying to show fail message ", e)
@@ -447,9 +448,13 @@ open class FolderPickerActivity :
                         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
-                        )
+                        val currentDir = if (currentFolder == null) {
+                            null
+                        } else {
+                            storageManager.getFileByPath(
+                                currentFolder!!.remotePath
+                            )
+                        }
                         if (currentDir == null) {
                             // current folder was removed from the server
                             DisplayUtils.showSnackMessage(

+ 5 - 2
app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt

@@ -88,6 +88,7 @@ class SyncedFoldersActivity :
 
     companion object {
         private const val SYNCED_FOLDER_PREFERENCES_DIALOG_TAG = "SYNCED_FOLDER_PREFERENCES_DIALOG"
+
         // yes, there is a typo in this value
         private const val KEY_SYNCED_FOLDER_INITIATED_PREFIX = "syncedFolderIntitiated_"
         private val PRIORITIZED_FOLDERS = arrayOf("Camera", "Screenshots")
@@ -579,7 +580,8 @@ class SyncedFoldersActivity :
         val ft = fm.beginTransaction()
         ft.addToBackStack(null)
         syncedFolderPreferencesDialogFragment = SyncedFolderPreferencesDialogFragment.newInstance(
-            syncedFolderDisplayItem, section
+            syncedFolderDisplayItem,
+            section
         ).also {
             it.show(ft, SYNCED_FOLDER_PREFERENCES_DIALOG_TAG)
         }
@@ -787,7 +789,8 @@ class SyncedFoldersActivity :
                 .setMessage(getString(R.string.battery_optimization_message))
                 .setPositiveButton(getString(R.string.battery_optimization_disable)) { _, _ ->
                     // show instant upload
-                    @SuppressLint("BatteryLife") val intent = Intent(
+                    @SuppressLint("BatteryLife")
+                    val intent = Intent(
                         Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
                         Uri.parse("package:" + BuildConfig.APPLICATION_ID)
                     )

+ 2 - 3
app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt

@@ -152,7 +152,8 @@ class GalleryAdapter(
             )
             headerViewHolder.binding.year.text = DisplayUtils.getDateByPattern(
                 galleryItem.date,
-                context, DisplayUtils.YEAR_PATTERN
+                context,
+                DisplayUtils.YEAR_PATTERN
             )
         }
     }
@@ -167,7 +168,6 @@ class GalleryAdapter(
         mediaState: GalleryFragmentBottomSheetDialog.MediaState,
         photoFragment: GalleryFragment
     ) {
-
         val items = storageManager.allGalleryItems
 
         val filteredList = items.filter { it != null && it.remotePath.startsWith(remotePath) }
@@ -186,7 +186,6 @@ class GalleryAdapter(
         mediaState: GalleryFragmentBottomSheetDialog.MediaState,
         photoFragment: GalleryFragment
     ) {
-
         val finalSortedList: List<OCFile> = when (mediaState) {
             GalleryFragmentBottomSheetDialog.MediaState.MEDIA_STATE_PHOTOS_ONLY -> {
                 items.filter { MimeTypeUtil.isImage(it.mimeType) }.distinct()

+ 0 - 1
app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt

@@ -65,7 +65,6 @@ class QuickSharingPermissionsAdapter(
             }
 
             itemView.setOnClickListener {
-
                 // if user select different options then only update the permission
                 if (!quickPermissionModel.isSelected) {
                     onPermissionChangeListener.onPermissionChanged(adapterPosition)

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt

@@ -30,7 +30,7 @@ import com.owncloud.android.ui.unifiedsearch.UnifiedSearchSection
 class UnifiedSearchFooterViewHolder(
     val binding: UnifiedSearchFooterBinding,
     val context: Context,
-    private val listInterface: UnifiedSearchListInterface,
+    private val listInterface: UnifiedSearchListInterface
 ) :
     SectionedViewHolder(binding.root) {
 

+ 6 - 2
app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt

@@ -67,13 +67,17 @@ class UnifiedSearchListAdapter(
         return when (viewType) {
             VIEW_TYPE_HEADER -> {
                 val binding = UnifiedSearchHeaderBinding.inflate(
-                    layoutInflater, parent, false
+                    layoutInflater,
+                    parent,
+                    false
                 )
                 UnifiedSearchHeaderViewHolder(binding, themeColorUtils, context)
             }
             VIEW_TYPE_FOOTER -> {
                 val binding = UnifiedSearchFooterBinding.inflate(
-                    layoutInflater, parent, false
+                    layoutInflater,
+                    parent,
+                    false
                 )
                 UnifiedSearchFooterViewHolder(binding, context, listInterface)
             }

+ 3 - 1
app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt

@@ -375,7 +375,9 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
                     .execute(client)
                 if (!result.isSuccess) {
                     TemplateList()
-                } else result.resultData
+                } else {
+                    result.resultData
+                }
             } catch (e: CreationException) {
                 Log_OC.e(TAG, "Could not fetch template", e)
                 TemplateList()

+ 4 - 2
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt

@@ -494,10 +494,12 @@ class FileDetailsSharingProcessFragment : Fragment(), ExpirationDatePickerDialog
 
     private fun updateShare() {
         fileOperationsHelper?.updateShareInformation(
-            share, permission,
+            share,
+            permission,
             binding.shareProcessHideDownloadCheckbox.isChecked,
             binding.shareProcessEnterPassword.text.toString().trim(),
-            chosenExpDateInMills, binding.shareProcessChangeNameEt.text.toString().trim()
+            chosenExpDateInMills,
+            binding.shareProcessChangeNameEt.text.toString().trim()
         )
         // copy the share link if available
         if (!TextUtils.isEmpty(share?.shareLink)) {

+ 9 - 3
app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt

@@ -93,7 +93,9 @@ class BackupListAdapter(
             VIEW_TYPE_HEADER -> {
                 BackupListHeaderViewHolder(
                     BackupListItemHeaderBinding.inflate(
-                        LayoutInflater.from(parent.context), parent, false
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
                     ),
                     context
                 )
@@ -101,14 +103,18 @@ class BackupListAdapter(
             VIEW_TYPE_CONTACTS -> {
                 ContactItemViewHolder(
                     ContactlistListItemBinding.inflate(
-                        LayoutInflater.from(parent.context), parent, false
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
                     )
                 )
             }
             else -> {
                 CalendarItemViewHolder(
                     CalendarlistListItemBinding.inflate(
-                        LayoutInflater.from(parent.context), parent, false
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
                     ),
                     context
                 )

+ 4 - 1
app/src/main/java/com/owncloud/android/ui/fragment/util/GalleryFastScrollViewHelper.kt

@@ -59,6 +59,7 @@ class GalleryFastScrollViewHelper(
 
     // header is always 1st in the adapter
     private val headerHeight by lazy { getItemHeight(0) }
+
     // the 2nd element is always an item
     private val rowHeight by lazy { getItemHeight(1) }
 
@@ -236,7 +237,9 @@ class GalleryFastScrollViewHelper(
         val position = getFirstItemAdapterPosition()
         return if (position == RecyclerView.NO_POSITION) {
             null
-        } else popupTextProvider.getPopupText(position)
+        } else {
+            popupTextProvider.getPopupText(position)
+        }
     }
 
     private fun getFirstItemAdapterPosition(): Int {

+ 0 - 1
app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt

@@ -211,7 +211,6 @@ class PreviewVideoActivity :
     override fun onStart() {
         super.onStart()
         if (account != null) {
-
             require(file != null) { throw IllegalStateException("Instanced with a NULL OCFile") }
             var fileToPlay: OCFile? = file
 

+ 3 - 1
app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfAdapter.kt

@@ -71,7 +71,9 @@ class PreviewPdfAdapter(
 
     private fun createBitmapForPage(page: PdfRenderer.Page): Bitmap {
         val bitmap = Bitmap.createBitmap(
-            screenWidth, (screenWidth.toFloat() / page.width * page.height).toInt(), Bitmap.Config.ARGB_8888
+            screenWidth,
+            (screenWidth.toFloat() / page.width * page.height).toInt(),
+            Bitmap.Config.ARGB_8888
         )
 
         val canvas = Canvas(bitmap)

+ 0 - 1
app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt

@@ -208,7 +208,6 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
 
     @Synchronized
     fun onSearchResult(result: UnifiedSearchResult) {
-
         if (result.success) {
             val providerMeta = results[result.provider] ?: UnifiedSearchMetadata()
             providerMeta.results.add(result.result)

+ 2 - 2
app/src/main/java/com/owncloud/android/utils/FileSortOrder.kt

@@ -33,9 +33,9 @@ open class FileSortOrder(@JvmField var name: String, var isAscending: Boolean) {
     val sortMultiplier: Int
         get() = if (isAscending) 1 else -1
 
-    @Suppress("EnumNaming") // already saved in user preferences -.-'
+    @Suppress("EnumNaming", "EnumEntryName") // already saved in user preferences -.-'
     enum class Type {
-        trashBinView, localFileListView
+        trashBinView, localFileListView // ktlint-disable enum-entry-name-case
     }
 
     enum class SortType {

+ 0 - 1
app/src/main/java/com/owncloud/android/utils/FileSortOrderBySize.kt

@@ -53,7 +53,6 @@ class FileSortOrderBySize internal constructor(name: String?, ascending: Boolean
     }
 
     override fun sortLocalFiles(files: MutableList<File>): List<File> {
-
         files.sortWith { o1: File, o2: File ->
             when {
                 o1.isDirectory && o2.isDirectory -> sortMultiplier * FileStorageUtils.getFolderSize(o1)

+ 4 - 2
app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt

@@ -153,7 +153,8 @@ object PermissionUtil {
     ) {
         fun doRequest() {
             ActivityCompat.requestPermissions(
-                activity, arrayOf(permission),
+                activity,
+                arrayOf(permission),
                 PERMISSIONS_EXTERNAL_STORAGE
             )
         }
@@ -252,7 +253,8 @@ object PermissionUtil {
     @JvmStatic
     fun requestCameraPermission(activity: Activity, requestCode: Int) {
         ActivityCompat.requestPermissions(
-            activity, arrayOf(Manifest.permission.CAMERA),
+            activity,
+            arrayOf(Manifest.permission.CAMERA),
             requestCode
         )
     }

+ 2 - 1
app/src/main/java/com/owncloud/android/utils/UriUtils.kt

@@ -57,7 +57,8 @@ object UriUtils {
         var displayName: String? = null
         try {
             context.contentResolver.query(
-                uri, arrayOf(displayNameColumn),
+                uri,
+                arrayOf(displayNameColumn),
                 null,
                 null,
                 null

+ 4 - 0
app/src/test/java/com/nextcloud/client/core/TaskTest.kt

@@ -34,12 +34,16 @@ class TaskTest {
 
     @Mock
     private lateinit var taskBody: TaskFunction<String, Int>
+
     @Mock
     private lateinit var removeFromQueue: (Runnable) -> Boolean
+
     @Mock
     private lateinit var onResult: OnResultCallback<String>
+
     @Mock
     private lateinit var onError: OnErrorCallback
+
     @Mock
     private lateinit var onProgress: OnProgressCallback<Int>
 

+ 0 - 1
app/src/test/java/com/nextcloud/client/logger/LoggerTest.kt

@@ -236,7 +236,6 @@ class LoggerTest {
 
     @Test
     fun `queue overflow warning is logged`() {
-
         // GIVEN
         //      logger loop is overflown
         for (i in 0..QUEUE_CAPACITY + 1) {

+ 1 - 1
app/src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt

@@ -33,7 +33,7 @@ import org.mockito.kotlin.whenever
 class AudioFocusManagerTest {
 
     private val audioManager = mock<AudioManager>()
-    private val callback = mock<(AudioFocus)->Unit>()
+    private val callback = mock<(AudioFocus) -> Unit>()
     private lateinit var audioFocusManager: AudioFocusManager
 
     val audioRequestMatcher = object : ArgumentMatcher<AudioFocusRequest> {

+ 1 - 1
app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt

@@ -73,7 +73,7 @@ class NaturalSortTest {
                 "With umlauts",
                 arrayOf(
                     "ah.txt", "äh.txt", "Äh.txt", "oh.txt", "öh.txt", "Öh.txt", "uh.txt", "üh.txt", "Üh.txt",
-                    "Üh 2.txt",
+                    "Üh 2.txt"
                 )
             ),
             arrayOf(

+ 0 - 1
app/src/test/java/com/nextcloud/client/utils/ThrottlerTest.kt

@@ -4,7 +4,6 @@ import com.nextcloud.client.core.Clock
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
 import io.mockk.every
-
 import io.mockk.impl.annotations.MockK
 import io.mockk.just
 import io.mockk.verify

+ 1 - 1
app/src/test/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverterTest.kt

@@ -107,7 +107,7 @@ class OCShareToOCFileConverterTest {
                 .apply {
                     shareType = ShareType.EMAIL
                     sharedDate = 5
-                },
+                }
         )
 
         val result = OCShareToOCFileConverter.buildOCFilesFromShares(shares)