Skip to content

Commit 885aa70

Browse files
JonasMayerDevJonasMayerDev
committed
Fix spotless issues
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
1 parent 5cc6322 commit 885aa70

11 files changed

Lines changed: 63 additions & 58 deletions

‎app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ import javax.inject.Inject
4646
class EtmBackgroundJobsFragment : EtmBaseFragment(), Injectable {
4747

4848
@Inject
49-
lateinit var preferences : AppPreferences
49+
lateinit var preferences: AppPreferences
5050

51-
class Adapter(private val inflater: LayoutInflater, private val preferences: AppPreferences) : RecyclerView.Adapter<Adapter.ViewHolder>(){
51+
class Adapter(private val inflater: LayoutInflater, private val preferences: AppPreferences) :
52+
RecyclerView.Adapter<Adapter.ViewHolder>() {
5253

5354
class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
5455
val uuid = view.findViewById<TextView>(R.id.etm_background_job_uuid)
@@ -88,7 +89,6 @@ class EtmBackgroundJobsFragment : EtmBaseFragment(), Injectable {
8889
View.GONE
8990
}
9091
}
91-
9292
}
9393

9494
private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:MM:ssZ", Locale.getDefault())
@@ -128,31 +128,33 @@ class EtmBackgroundJobsFragment : EtmBaseFragment(), Injectable {
128128
vh.progressEnabled = false
129129
}
130130

131-
val logs = preferences.readLogEntry()
132-
val logsForThisWorker = logs.filter { BackgroundJobManagerImpl.parseTag(it.workerClass)?.second == info.workerClass }
133-
if(logsForThisWorker.isNotEmpty()) {
131+
val logs = preferences.readLogEntry()
132+
val logsForThisWorker =
133+
logs.filter { BackgroundJobManagerImpl.parseTag(it.workerClass)?.second == info.workerClass }
134+
if (logsForThisWorker.isNotEmpty()) {
134135
vh.executionTimesRow.visibility = View.VISIBLE
135-
vh.executionCount.text = logsForThisWorker.filter { it.started != null }.size.toString() + " (${logsForThisWorker.filter { it.finished != null }.size})"
136+
vh.executionCount.text =
137+
"${logsForThisWorker.filter { it.started != null }.size} " +
138+
"(${logsForThisWorker.filter { it.finished != null }.size})"
136139
var logText = "Worker Logs\n\n" +
137-
"*** Does NOT differentiate between imitate or periodic kinds of Work! ***\n"+
140+
"*** Does NOT differentiate between imitate or periodic kinds of Work! ***\n" +
138141
"*** Times run in 48h: Times started (Times finished) ***\n"
139-
logsForThisWorker.forEach{
142+
logsForThisWorker.forEach {
140143
logText += "----------------------\n"
141144
logText += "Worker ${BackgroundJobManagerImpl.parseTag(it.workerClass)?.second}\n"
142-
logText += if (it.started == null){
145+
logText += if (it.started == null) {
143146
"ENDED at\n${it.finished}\nWith result: ${it.result}\n"
144-
}else{
147+
} else {
145148
"STARTED at\n${it.started}\n"
146149
}
147150
}
148151
vh.executionLog.text = logText
149-
}else{
152+
} else {
150153
vh.executionLog.text = "Worker Logs\n\n" +
151154
"No Entries -> Maybe logging is not implemented for Worker or it has not run yet."
152155
vh.executionCount.text = "0"
153156
vh.executionTimesRow.visibility = View.GONE
154157
}
155-
156158
}
157159
}
158160

@@ -186,22 +188,27 @@ class EtmBackgroundJobsFragment : EtmBaseFragment(), Injectable {
186188
vm.cancelAllJobs()
187189
true
188190
}
191+
189192
R.id.etm_background_jobs_prune -> {
190193
vm.pruneJobs()
191194
true
192195
}
196+
193197
R.id.etm_background_jobs_start_test -> {
194198
vm.startTestJob(periodic = false)
195199
true
196200
}
201+
197202
R.id.etm_background_jobs_schedule_test -> {
198203
vm.startTestJob(periodic = true)
199204
true
200205
}
206+
201207
R.id.etm_background_jobs_cancel_test -> {
202208
vm.cancelTestJob()
203209
true
204210
}
211+
205212
else -> super.onOptionsItemSelected(item)
206213
}
207214
}

‎app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import javax.inject.Provider
5151
*
5252
* This class is doing too many things and should be split up into smaller factories.
5353
*/
54-
@Suppress("LongParameterList") // satisfied by DI
54+
@Suppress("LongParameterList", "TooManyFunctions") // satisfied by DI
5555
class BackgroundJobFactory @Inject constructor(
5656
private val logger: Logger,
5757
private val preferences: AppPreferences,
@@ -143,7 +143,7 @@ class BackgroundJobFactory @Inject constructor(
143143
resources,
144144
arbitraryDataProvider,
145145
contentResolver,
146-
accountManager,
146+
accountManager
147147
)
148148
}
149149

@@ -152,7 +152,7 @@ class BackgroundJobFactory @Inject constructor(
152152
context,
153153
params,
154154
logger,
155-
contentResolver,
155+
contentResolver
156156
)
157157
}
158158

@@ -162,7 +162,7 @@ class BackgroundJobFactory @Inject constructor(
162162
params,
163163
contentResolver,
164164
accountManager,
165-
preferences,
165+
preferences
166166
)
167167
}
168168

@@ -171,7 +171,7 @@ class BackgroundJobFactory @Inject constructor(
171171
context,
172172
params,
173173
logger,
174-
contentResolver,
174+
contentResolver
175175
)
176176
}
177177

@@ -210,7 +210,7 @@ class BackgroundJobFactory @Inject constructor(
210210
preferences,
211211
clock,
212212
viewThemeUtils.get(),
213-
syncedFolderProvider,
213+
syncedFolderProvider
214214
)
215215
}
216216

@@ -221,7 +221,7 @@ class BackgroundJobFactory @Inject constructor(
221221
notificationManager,
222222
accountManager,
223223
deckApi,
224-
viewThemeUtils.get(),
224+
viewThemeUtils.get()
225225
)
226226
}
227227

@@ -249,7 +249,7 @@ class BackgroundJobFactory @Inject constructor(
249249
localBroadcastManager.get(),
250250
backgroundJobManager.get(),
251251
context,
252-
params,
252+
params
253253
)
254254
}
255255

@@ -261,7 +261,7 @@ class BackgroundJobFactory @Inject constructor(
261261
notificationManager = notificationManager,
262262
userAccountManager = accountManager,
263263
logger = logger,
264-
params = params,
264+
params = params
265265
)
266266
}
267267

‎app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ interface BackgroundJobManager {
3636
*/
3737
val jobs: LiveData<List<JobInfo>>
3838

39-
fun logStartOfWorker(workerName : String?)
39+
fun logStartOfWorker(workerName: String?)
4040

4141
fun logEndOfWorker(workerName: String?, result: ListenableWorker.Result)
4242

‎app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ internal class BackgroundJobManagerImpl(
6666
private val preferences: AppPreferences
6767
) : BackgroundJobManager, Injectable {
6868

69-
7069
companion object {
7170

7271
const val TAG_ALL = "*" // This tag allows us to retrieve list of all jobs run by Nextcloud client
@@ -105,7 +104,7 @@ internal class BackgroundJobManagerImpl(
105104
const val DEFAULT_PERIODIC_JOB_INTERVAL_MINUTES = 15L
106105
const val DEFAULT_IMMEDIATE_JOB_DELAY_SEC = 3L
107106

108-
private const val KEEP_LOG_MILLIS = 1000 * 60 * 60 * 24 *3L
107+
private const val KEEP_LOG_MILLIS = 1000 * 60 * 60 * 24 * 3L
109108

110109
fun formatNameTag(name: String, user: User? = null): String {
111110
return if (user == null) {
@@ -130,11 +129,11 @@ internal class BackgroundJobManagerImpl(
130129
}
131130

132131
fun parseTimestamp(timestamp: String): Date {
133-
try {
132+
return try {
134133
val ms = timestamp.toLong()
135-
return Date(ms)
134+
Date(ms)
136135
} catch (ex: NumberFormatException) {
137-
return Date(0)
136+
Date(0)
138137
}
139138
}
140139

@@ -161,40 +160,38 @@ internal class BackgroundJobManagerImpl(
161160
}
162161
}
163162

164-
fun deleteOldLogs(logEntries: MutableList<LogEntry>) : MutableList<LogEntry>{
165-
163+
fun deleteOldLogs(logEntries: MutableList<LogEntry>): MutableList<LogEntry> {
166164
logEntries.removeIf {
167-
return@removeIf (it.started != null &&
168-
Date(Date().time - KEEP_LOG_MILLIS).after(it.started)) ||
169-
(it.finished != null &&
170-
Date(Date().time - KEEP_LOG_MILLIS).after(it.finished))
171-
165+
return@removeIf (
166+
it.started != null &&
167+
Date(Date().time - KEEP_LOG_MILLIS).after(it.started)
168+
) ||
169+
(
170+
it.finished != null &&
171+
Date(Date().time - KEEP_LOG_MILLIS).after(it.finished)
172+
)
172173
}
173174
return logEntries
174-
175175
}
176-
177-
178176
}
179177

180-
override fun logStartOfWorker(workerName : String?) {
178+
override fun logStartOfWorker(workerName: String?) {
181179
val logs = deleteOldLogs(preferences.readLogEntry().toMutableList())
182180

183181
if (workerName == null) {
184182
logs.add(LogEntry(Date(), null, null, NOT_SET_VALUE))
185-
}else{
183+
} else {
186184
logs.add(LogEntry(Date(), null, null, workerName))
187185
}
188186
preferences.saveLogEntry(logs)
189187
}
190188

191-
override fun logEndOfWorker(workerName: String?, result: ListenableWorker.Result){
192-
189+
override fun logEndOfWorker(workerName: String?, result: ListenableWorker.Result) {
193190
val logs = deleteOldLogs(preferences.readLogEntry().toMutableList())
194191
if (workerName == null) {
195-
logs.add(LogEntry(null,Date(),result.toString(), NOT_SET_VALUE))
196-
}else{
197-
logs.add(LogEntry(null,Date(),result.toString(),workerName))
192+
logs.add(LogEntry(null, Date(), result.toString(), NOT_SET_VALUE))
193+
} else {
194+
logs.add(LogEntry(null, Date(), result.toString(), workerName))
198195
}
199196
preferences.saveLogEntry(logs)
200197
}

‎app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ContentObserverWork(
5050
recheduleSelf()
5151

5252
val result = Result.success()
53-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
53+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
5454
return result
5555
}
5656

‎app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class FilesSyncWork(
8181
// If we are in power save mode, better to postpone upload
8282
if (powerManagementService.isPowerSavingEnabled && !overridePowerSaving) {
8383
val result = Result.success()
84-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
84+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
8585
return result
8686
}
8787
val resources = context.resources
@@ -113,7 +113,7 @@ class FilesSyncWork(
113113
}
114114
}
115115
val result = Result.success()
116-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
116+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
117117
return result
118118
}
119119

‎app/src/main/java/com/nextcloud/client/jobs/FilesUploadWorker.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class FilesUploadWorker(
8888
Log_OC.w(TAG, "User was null for file upload worker")
8989

9090
val result = Result.failure()
91-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
91+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
9292
return result // user account is needed
9393
}
9494

@@ -107,7 +107,7 @@ class FilesUploadWorker(
107107

108108
Log_OC.d(TAG, "No more pending uploads for account $accountName, stopping work")
109109
val result = Result.success()
110-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
110+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
111111
return result // user account is needed
112112
}
113113

‎app/src/main/java/com/nextcloud/client/jobs/HealthStatusWork.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class HealthStatusWork(
9696
}
9797

9898
val result = Result.success()
99-
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class),result)
99+
backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
100100
return result
101101
}
102102

‎app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
package com.nextcloud.client.jobs
2121

22-
import androidx.work.ListenableWorker
23-
import com.google.common.util.concurrent.ListenableFuture
2422
import java.util.Date
2523
import java.util.UUID
2624

@@ -31,11 +29,10 @@ data class JobInfo(
3129
val user: String = "",
3230
val workerClass: String = "",
3331
val started: Date = Date(0),
34-
val progress: Int = 0,
32+
val progress: Int = 0
3533
)
3634

37-
38-
data class LogEntry (
35+
data class LogEntry(
3936
val started: Date? = null,
4037
val finished: Date? = null,
4138
val result: String? = null,

‎app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ class JobsModule {
5151

5252
@Provides
5353
@Singleton
54-
fun backgroundJobManager(workManager: WorkManager, clock: Clock, preferences: AppPreferences): BackgroundJobManager {
54+
fun backgroundJobManager(
55+
workManager: WorkManager,
56+
clock: Clock,
57+
preferences: AppPreferences
58+
): BackgroundJobManager {
5559
return BackgroundJobManagerImpl(workManager, clock, preferences)
5660
}
5761
}

0 commit comments

Comments
 (0)