Skip to content

Commit c907885

Browse files
committed
fix: Fix detekt issues and add missing imports
1 parent 9a6d876 commit c907885

File tree

5 files changed

+42
-17
lines changed

5 files changed

+42
-17
lines changed

opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/security/SettingsSecurityFragment.kt

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,16 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
117117

118118
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
119119
setPreferencesFromResource(R.xml.settings_security, rootKey)
120+
initializePreferences(rootKey)
121+
configureLockPreferences()
122+
configureBiometricPreference()
123+
configureSecurityPreferences()
124+
configureDownloadAndSyncPreferences()
125+
}
126+
127+
128+
@Suppress("UnusedParameter")
129+
private fun initializePreferences(rootKey: String?) {
120130
screenSecurity = findPreference(SCREEN_SECURITY)
121131
prefPasscode = findPreference(PassCodeActivity.PREFERENCE_SET_PASSCODE)
122132
prefPattern = findPreference(PatternActivity.PREFERENCE_SET_PATTERN)
@@ -144,7 +154,9 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
144154

145155
prefPasscode?.isVisible = !securityViewModel.isSecurityEnforcedEnabled()
146156
prefPattern?.isVisible = !securityViewModel.isSecurityEnforcedEnabled()
157+
}
147158

159+
private fun configureLockPreferences() {
148160
// Passcode lock
149161
prefPasscode?.setOnPreferenceChangeListener { _: Preference?, newValue: Any ->
150162
if (securityViewModel.isPatternSet()) {
@@ -178,8 +190,9 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
178190
}
179191
false
180192
}
193+
}
181194

182-
// Biometric lock
195+
private fun configureBiometricPreference() {
183196
if (prefBiometric != null) {
184197
if (!BiometricManager.isHardwareDetected()) { // Biometric not supported
185198
screenSecurity?.removePreferenceFromScreen(prefBiometric)
@@ -201,8 +214,12 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
201214
}
202215

203216
// Lock application
204-
if (prefPasscode?.isChecked == false && prefPattern?.isChecked == false) { prefLockApplication?.isEnabled = false }
217+
if (prefPasscode?.isChecked == false && prefPattern?.isChecked == false) {
218+
prefLockApplication?.isEnabled = false
219+
}
220+
}
205221

222+
private fun configureSecurityPreferences() {
206223
// Lock access from document provider
207224
prefLockAccessDocumentProvider?.setOnPreferenceChangeListener { _: Preference?, newValue: Any ->
208225
securityViewModel.setPrefLockAccessDocumentProvider(true)
@@ -231,7 +248,9 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
231248
}
232249
true
233250
}
251+
}
234252

253+
private fun configureDownloadAndSyncPreferences() {
235254
// Download Everything Feature
236255
prefDownloadEverything?.setOnPreferenceChangeListener { _: Preference?, newValue: Any ->
237256
if (newValue as Boolean) {

opencloudApp/src/main/java/eu/opencloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,13 @@ import eu.opencloud.android.syncadapter.FileSyncAdapter
114114
import eu.opencloud.android.ui.fragment.FileFragment
115115
import eu.opencloud.android.ui.fragment.TaskRetainerFragment
116116
import eu.opencloud.android.ui.helpers.FilesUploadHelper
117+
import eu.opencloud.android.ui.dialog.FileAlreadyExistsDialog
117118
import eu.opencloud.android.ui.preview.PreviewAudioFragment
119+
import eu.opencloud.android.ui.preview.PreviewImageActivity
120+
import eu.opencloud.android.ui.preview.PreviewImageFragment
118121
import eu.opencloud.android.ui.preview.PreviewTextFragment
119122
import eu.opencloud.android.ui.preview.PreviewVideoActivity
123+
import androidx.work.WorkManager
120124
import eu.opencloud.android.usecases.synchronization.SynchronizeFileUseCase
121125
import eu.opencloud.android.usecases.transfers.downloads.DownloadFileUseCase
122126
import eu.opencloud.android.utils.PreferenceUtils

opencloudApp/src/main/java/eu/opencloud/android/workers/DownloadEverythingWorker.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class DownloadEverythingWorker(
120120
spaces.forEachIndexed { spaceIndex, space ->
121121
Timber.i("Processing space ${spaceIndex + 1}/${spaces.size}: ${space.name}")
122122
updateNotification("Space ${spaceIndex + 1}/${spaces.size}: ${space.name}")
123-
123+
124124
processSpaceRoot(accountName, ROOT_PATH, space.root.id)
125125
}
126126
}
@@ -148,30 +148,30 @@ class DownloadEverythingWorker(
148148
private fun processSpaceRoot(accountName: String, remotePath: String, spaceId: String?) {
149149
try {
150150
Timber.i("Processing space root: remotePath=$remotePath, spaceId=$spaceId")
151-
151+
152152
// First refresh the root folder from server to ensure DB has latest data
153153
fileRepository.refreshFolder(
154154
remotePath = remotePath,
155155
accountName = accountName,
156156
spaceId = spaceId,
157157
isActionSetFolderAvailableOfflineOrSynchronize = false
158158
)
159-
159+
160160
// Now get the root folder from local database
161161
val rootFolder = getFileByRemotePathUseCase(
162162
GetFileByRemotePathUseCase.Params(accountName, remotePath, spaceId)
163163
).getDataOrNull()
164-
164+
165165
if (rootFolder == null) {
166166
Timber.w("Root folder not found after refresh for spaceId=$spaceId")
167167
return
168168
}
169-
169+
170170
Timber.i("Got root folder with id=${rootFolder.id}, remotePath=${rootFolder.remotePath}")
171-
171+
172172
// Process the root folder recursively
173173
processFolderRecursively(accountName, rootFolder, spaceId)
174-
174+
175175
} catch (e: Exception) {
176176
Timber.e(e, "Error processing space root: spaceId=$spaceId")
177177
}
@@ -188,10 +188,10 @@ class DownloadEverythingWorker(
188188
Timber.w("Folder ${folder.remotePath} has no id, skipping")
189189
return
190190
}
191-
191+
192192
foldersProcessed++
193193
Timber.d("Processing folder: ${folder.remotePath} (id=$folderId)")
194-
194+
195195
// First refresh this folder from server
196196
try {
197197
fileRepository.refreshFolder(
@@ -203,10 +203,10 @@ class DownloadEverythingWorker(
203203
} catch (e: Exception) {
204204
Timber.e(e, "Error refreshing folder ${folder.remotePath}")
205205
}
206-
206+
207207
// Now get ALL content from local database (this returns everything, not just changes)
208208
val folderContent = fileRepository.getFolderContent(folderId)
209-
209+
210210
Timber.d("Folder ${folder.remotePath} contains ${folderContent.size} items")
211211

212212
folderContent.forEach { item ->
@@ -218,7 +218,7 @@ class DownloadEverythingWorker(
218218
processFile(accountName, item)
219219
}
220220
}
221-
221+
222222
// Update notification periodically
223223
if (foldersProcessed % 5 == 0) {
224224
updateNotification("Scanning: $foldersProcessed folders, $totalFilesFound files found")
@@ -234,7 +234,7 @@ class DownloadEverythingWorker(
234234
*/
235235
private fun processFile(accountName: String, file: OCFile) {
236236
totalFilesFound++
237-
237+
238238
try {
239239
if (file.isAvailableLocally) {
240240
// File is already downloaded
@@ -251,7 +251,7 @@ class DownloadEverythingWorker(
251251
Timber.d("Download already enqueued or skipped: ${file.fileName}")
252252
}
253253
}
254-
254+
255255
// Update notification periodically (every 20 files)
256256
if (totalFilesFound % 20 == 0) {
257257
updateNotification("Found: $totalFilesFound files, $filesDownloaded queued for download")
@@ -298,7 +298,7 @@ class DownloadEverythingWorker(
298298
const val DOWNLOAD_EVERYTHING_WORKER = "DOWNLOAD_EVERYTHING_WORKER"
299299
const val repeatInterval: Long = 6L
300300
val repeatIntervalTimeUnit: TimeUnit = TimeUnit.HOURS
301-
301+
302302
private const val NOTIFICATION_CHANNEL_ID = "download_everything_channel"
303303
private const val NOTIFICATION_ID = 9001
304304
}

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import java.net.URL
4141
* @author David A. Velasco
4242
* @author David González Verdugo
4343
*/
44+
@Suppress("UnusedPrivateProperty")
4445
class GetRemoteUserAvatarOperation(private val avatarDimension: Int) : RemoteOperation<RemoteAvatarData>() {
4546
override fun run(client: OpenCloudClient): RemoteOperationResult<RemoteAvatarData> {
4647
var inputStream: InputStream? = null

opencloudData/src/main/java/eu/opencloud/android/data/providers/ScopedStorageProvider.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import android.content.Context
2323
import android.os.Environment
2424
import java.io.File
2525

26+
@Suppress("UnusedPrivateProperty")
2627
class ScopedStorageProvider(
2728
rootFolderName: String,
2829
private val context: Context

0 commit comments

Comments
 (0)