Skip to content

Commit f621acc

Browse files
oluiscabraloluiscabral
committed
style: ./gradlew ktlintFormat
1 parent 5cea8e9 commit f621acc

25 files changed

Lines changed: 757 additions & 400 deletions

‎shared/build.gradle.kts‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,38 @@ kotlin {
3737
iosTarget.compilations.getByName("main") {
3838
val iosAppPath = rootProject.projectDir.resolve("iosApp/iosApp")
3939

40-
val arkDropBridgeCinterop = cinterops.create("ArkDropBridge") {
41-
defFile(project.file("src/nativeInterop/cinterop/ArkDropBridge.def"))
42-
packageName("dev.arkbuilders.drop.bridge")
43-
compilerOpts(
44-
"-framework", "Foundation",
45-
"-I${iosAppPath.absolutePath}"
46-
)
47-
includeDirs(iosAppPath.absolutePath)
48-
}
40+
val arkDropBridgeCinterop =
41+
cinterops.create("ArkDropBridge") {
42+
defFile(project.file("src/nativeInterop/cinterop/ArkDropBridge.def"))
43+
packageName("dev.arkbuilders.drop.bridge")
44+
compilerOpts(
45+
"-framework",
46+
"Foundation",
47+
"-I${iosAppPath.absolutePath}",
48+
)
49+
includeDirs(iosAppPath.absolutePath)
50+
}
4951

50-
val crashlyticsBridgeCinterop = cinterops.create("CrashlyticsBridge") {
51-
defFile(project.file("src/nativeInterop/cinterop/CrashlyticsBridge.def"))
52-
packageName("dev.arkbuilders.drop.bridge")
53-
compilerOpts(
54-
"-framework", "Foundation",
55-
"-I${iosAppPath.absolutePath}"
56-
)
57-
includeDirs(iosAppPath.absolutePath)
58-
}
52+
val crashlyticsBridgeCinterop =
53+
cinterops.create("CrashlyticsBridge") {
54+
defFile(project.file("src/nativeInterop/cinterop/CrashlyticsBridge.def"))
55+
packageName("dev.arkbuilders.drop.bridge")
56+
compilerOpts(
57+
"-framework",
58+
"Foundation",
59+
"-I${iosAppPath.absolutePath}",
60+
)
61+
includeDirs(iosAppPath.absolutePath)
62+
}
5963

6064
// Ensure cinterop runs before Kotlin compilation
6165
compileTaskProvider.configure {
62-
dependsOn("cinteropArkDropBridge${iosTarget.name.replaceFirstChar { it.uppercase() }}")
63-
dependsOn("cinteropCrashlyticsBridge${iosTarget.name.replaceFirstChar { it.uppercase() }}")
66+
dependsOn(
67+
"cinteropArkDropBridge${iosTarget.name.replaceFirstChar { it.uppercase() }}",
68+
)
69+
dependsOn(
70+
"cinteropCrashlyticsBridge${iosTarget.name.replaceFirstChar { it.uppercase() }}",
71+
)
6472
}
6573
}
6674

‎shared/src/androidMain/kotlin/dev/arkbuilders/drop/di/PlatformModule.android.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import dev.arkbuilders.drop.data.helper.AvatarHelper
99
import dev.arkbuilders.drop.data.helper.NetworkStatus
1010
import dev.arkbuilders.drop.data.helper.PermissionsHelper
1111
import dev.arkbuilders.drop.data.helper.ResourcesHelper
12-
import dev.arkbuilders.drop.instrumentation.FirebaseReporter
1312
import dev.arkbuilders.drop.data.settings.DATASTORE_FILENAME
1413
import dev.arkbuilders.drop.data.settings.createDataStore
14+
import dev.arkbuilders.drop.instrumentation.FirebaseReporter
1515
import kotlinx.coroutines.Dispatchers
1616
import org.koin.android.ext.koin.androidApplication
1717
import org.koin.android.ext.koin.androidContext

‎shared/src/androidMain/kotlin/dev/arkbuilders/drop/instrumentation/FirebaseReporter.android.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
55
actual class FirebaseReporter {
66
private val instance = FirebaseCrashlytics.getInstance()
77

8-
actual fun recordError(message: String, throwable: Throwable?) {
8+
actual fun recordError(
9+
message: String,
10+
throwable: Throwable?,
11+
) {
912
if (throwable != null) {
1013
instance.recordException(throwable)
1114
} else {
@@ -17,7 +20,10 @@ actual class FirebaseReporter {
1720
instance.log(message)
1821
}
1922

20-
actual fun setCustomKey(key: String, value: String) {
23+
actual fun setCustomKey(
24+
key: String,
25+
value: String,
26+
) {
2127
instance.setCustomKey(key, value)
2228
}
2329

‎shared/src/commonMain/kotlin/dev/arkbuilders/drop/data/repository/ReceiveSessionRepoImpl.kt‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ class ReceiveSessionRepoImpl(
3535
confirmation: UByte,
3636
): ReceiveSession? =
3737
withContext(Dispatchers.IO) {
38-
firebaseReporter.log("ReceiveSessionRepo: receiveFiles ticket=$ticket confirmation=$confirmation")
38+
firebaseReporter.log(
39+
"ReceiveSessionRepo: receiveFiles ticket=$ticket confirmation=$confirmation",
40+
)
3941

4042
receiveFilesUseCase.invoke(ticket, confirmation).fold(
4143
onSuccess = { bubble ->
42-
firebaseReporter.log("ReceiveSessionRepo: use case returned bubble, creating subscriber")
44+
firebaseReporter.log(
45+
"ReceiveSessionRepo: use case returned bubble, creating subscriber",
46+
)
4347

4448
val subscriber =
4549
getDropApi().createReceiveSubscriber().also { subscriber ->
@@ -53,16 +57,24 @@ class ReceiveSessionRepoImpl(
5357
)
5458
activeSessionsMutex.withLock {
5559
activeSessions.add(session)
56-
firebaseReporter.setCustomKey("active_receive_count", activeSessions.size.toString())
60+
firebaseReporter.setCustomKey(
61+
"active_receive_count",
62+
activeSessions.size.toString(),
63+
)
5764
}
5865

5966
firebaseReporter.log("ReceiveSessionRepo: starting bubble")
6067
bubble.start()
61-
firebaseReporter.log("ReceiveSessionRepo: session created and started successfully")
68+
firebaseReporter.log(
69+
"ReceiveSessionRepo: session created and started successfully",
70+
)
6271
return@withContext session
6372
},
6473
onFailure = { e ->
65-
firebaseReporter.recordError("ReceiveSessionRepo: receiveFiles failed ticket=$ticket", e)
74+
firebaseReporter.recordError(
75+
"ReceiveSessionRepo: receiveFiles failed ticket=$ticket",
76+
e,
77+
)
6678
return@withContext null
6779
},
6880
)
@@ -74,19 +86,26 @@ class ReceiveSessionRepoImpl(
7486
val completeFiles = subscriber.getCompleteFiles()
7587
val savedFiles = mutableListOf<DropFileInfo>()
7688

77-
firebaseReporter.log("ReceiveSessionRepo: saveReceivedFiles completeFiles=${completeFiles.size}")
89+
firebaseReporter.log(
90+
"ReceiveSessionRepo: saveReceivedFiles completeFiles=${completeFiles.size}",
91+
)
7892

7993
try {
8094
completeFiles.forEach { (fileInfo, data) ->
81-
firebaseReporter.log("ReceiveSessionRepo: saving file name=${fileInfo.name} size=${fileInfo.size}")
95+
firebaseReporter.log(
96+
"ReceiveSessionRepo: saving file name=${fileInfo.name} size=${fileInfo.size}",
97+
)
8298
val savedFile = resourcesHelper.saveFileToDownloads(fileInfo.name, data)
8399
if (savedFile != null) {
84100
savedFiles.add(DropFileInfo(savedFile, fileInfo.size.toLong()))
85101
Logger.i("Saved file name: $savedFile")
86102
firebaseReporter.log("ReceiveSessionRepo: file saved path=$savedFile")
87103
} else {
88104
Logger.e("Failed to save file: ${fileInfo.name}")
89-
firebaseReporter.recordError("ReceiveSessionRepo: failed to save file name=${fileInfo.name}", null)
105+
firebaseReporter.recordError(
106+
"ReceiveSessionRepo: failed to save file name=${fileInfo.name}",
107+
null,
108+
)
90109
}
91110
}
92111

@@ -95,17 +114,23 @@ class ReceiveSessionRepoImpl(
95114
val senderAvatar = progress.senderAvatar
96115

97116
if (savedFiles.isNotEmpty()) {
98-
firebaseReporter.log("ReceiveSessionRepo: adding completed transfer to history files=${savedFiles.size} sender=$senderName")
117+
firebaseReporter.log(
118+
"ReceiveSessionRepo: adding completed transfer to history files=${savedFiles.size} sender=$senderName",
119+
)
99120

100121
transferHistoryRepository.addReceivedTransfer(
101122
files = savedFiles,
102123
peerName = senderName,
103124
peerAvatar = senderAvatar,
104125
status = TransferStatus.COMPLETED,
105126
)
106-
firebaseReporter.log("ReceiveSessionRepo: transfer history entry added successfully")
127+
firebaseReporter.log(
128+
"ReceiveSessionRepo: transfer history entry added successfully",
129+
)
107130
} else {
108-
firebaseReporter.log("ReceiveSessionRepo: no files saved, adding failed transfer to history")
131+
firebaseReporter.log(
132+
"ReceiveSessionRepo: no files saved, adding failed transfer to history",
133+
)
109134

110135
transferHistoryRepository.addReceivedTransfer(
111136
files = emptyList(),
@@ -130,7 +155,9 @@ class ReceiveSessionRepoImpl(
130155
)
131156
}
132157

133-
firebaseReporter.log("ReceiveSessionRepo: saveReceivedFiles completed savedCount=${savedFiles.size}")
158+
firebaseReporter.log(
159+
"ReceiveSessionRepo: saveReceivedFiles completed savedCount=${savedFiles.size}",
160+
)
134161
return@withContext savedFiles.map { it.name }
135162
}
136163

@@ -140,7 +167,10 @@ class ReceiveSessionRepoImpl(
140167
try {
141168
activeSessionsMutex.withLock {
142169
activeSessions.remove(session)
143-
firebaseReporter.setCustomKey("active_receive_count", activeSessions.size.toString())
170+
firebaseReporter.setCustomKey(
171+
"active_receive_count",
172+
activeSessions.size.toString(),
173+
)
144174
}
145175
session.bubble.unsubscribe(session.subscriber)
146176
session.bubble.cancel()

‎shared/src/commonMain/kotlin/dev/arkbuilders/drop/data/repository/SendSessionRepoImpl.kt‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ class SendSessionRepoImpl(
3333
override suspend fun sendFiles(fileUris: List<String>): SendSession? =
3434
withContext(Dispatchers.IO) {
3535
val cleaned = cleanupFinishedSessions()
36-
firebaseReporter.log("SendSessionRepo: sendFiles called - files: ${fileUris.size}, cleaned sessions: $cleaned")
36+
firebaseReporter.log(
37+
"SendSessionRepo: sendFiles called - files: ${fileUris.size}, cleaned sessions: $cleaned",
38+
)
3739

3840
sendUseCase.invoke(fileUris).fold(
3941
onSuccess = { bubble ->
@@ -45,15 +47,20 @@ class SendSessionRepoImpl(
4547
val session = SendSession(bubble, subscriber)
4648
val ticket = bubble.getTicket()
4749
firebaseReporter.setCustomKey("send_ticket_$ticket", "active")
48-
firebaseReporter.log("SendSessionRepo: session created - ticket: $ticket, activeSessions: ${activeSessions.size + 1}")
50+
firebaseReporter.log(
51+
"SendSessionRepo: session created - ticket: $ticket, activeSessions: ${activeSessions.size + 1}",
52+
)
4953

5054
activeSessionsMutex.withLock {
5155
activeSessions.add(session)
5256
}
5357
return@withContext session
5458
},
5559
onFailure = { error ->
56-
firebaseReporter.recordError("SendSessionRepo: sendFiles failed - ${error.message}", error)
60+
firebaseReporter.recordError(
61+
"SendSessionRepo: sendFiles failed - ${error.message}",
62+
error,
63+
)
5764
return@withContext null
5865
},
5966
)
@@ -64,7 +71,9 @@ class SendSessionRepoImpl(
6471
session: SendSession,
6572
) {
6673
try {
67-
firebaseReporter.log("SendSessionRepo: recording send completion for ${fileUris.size} files")
74+
firebaseReporter.log(
75+
"SendSessionRepo: recording send completion for ${fileUris.size} files",
76+
)
6877
cleanupFinishedSessions()
6978
val progress = session.subscriber.progress.value
7079
val receiverName = progress.receiverName
@@ -73,13 +82,17 @@ class SendSessionRepoImpl(
7382
val totalRemaining = progress.remaining
7483

7584
firebaseReporter.setCustomKey("send_receiver", receiverName)
76-
firebaseReporter.log("SendSessionRepo: transfer completed - receiver: $receiverName, sent: $totalSent, remaining: $totalRemaining")
85+
firebaseReporter.log(
86+
"SendSessionRepo: transfer completed - receiver: $receiverName, sent: $totalSent, remaining: $totalRemaining",
87+
)
7788

7889
val filesInfo =
7990
fileUris.map {
8091
val name = resourcesHelper.getFileName(it) ?: ""
8192
val size = resourcesHelper.getFileSize(it)
82-
firebaseReporter.log("SendSessionRepo: recording file - name: $name, size: $size")
93+
firebaseReporter.log(
94+
"SendSessionRepo: recording file - name: $name, size: $size",
95+
)
8396
DropFileInfo(
8497
name = name,
8598
size = size,
@@ -95,9 +108,14 @@ class SendSessionRepoImpl(
95108

96109
val ticket = session.bubble.getTicket()
97110
firebaseReporter.setCustomKey("send_ticket_$ticket", "completed")
98-
firebaseReporter.log("SendSessionRepo: send completion recorded successfully - ticket: $ticket")
111+
firebaseReporter.log(
112+
"SendSessionRepo: send completion recorded successfully - ticket: $ticket",
113+
)
99114
} catch (e: Exception) {
100-
firebaseReporter.recordError("SendSessionRepo: error recording send completion - ${e.message}", e)
115+
firebaseReporter.recordError(
116+
"SendSessionRepo: error recording send completion - ${e.message}",
117+
e,
118+
)
101119
Logger.e("Error recording send completion ${e.message}")
102120
}
103121
}
@@ -113,10 +131,15 @@ class SendSessionRepoImpl(
113131
}
114132
session.bubble.unsubscribe(session.subscriber)
115133
session.bubble.cancel()
116-
firebaseReporter.log("SendSessionRepo: send cancelled successfully - ticket: $ticket")
134+
firebaseReporter.log(
135+
"SendSessionRepo: send cancelled successfully - ticket: $ticket",
136+
)
117137
firebaseReporter.setCustomKey("send_ticket_$ticket", "cancelled")
118138
} catch (e: Throwable) {
119-
firebaseReporter.recordError("SendSessionRepo: error during cancel - ticket: $ticket, error: ${e.message}", e)
139+
firebaseReporter.recordError(
140+
"SendSessionRepo: error during cancel - ticket: $ticket, error: ${e.message}",
141+
e,
142+
)
120143
Logger.e("Error cancelling send ${e.message}")
121144
}
122145
}
@@ -128,7 +151,9 @@ class SendSessionRepoImpl(
128151
activeSessions.removeAll { it.bubble.isFinished() }
129152
val removed = before - activeSessions.size
130153
if (removed > 0) {
131-
firebaseReporter.log("SendSessionRepo: cleaned $removed finished sessions, ${activeSessions.size} remaining")
154+
firebaseReporter.log(
155+
"SendSessionRepo: cleaned $removed finished sessions, ${activeSessions.size} remaining",
156+
)
132157
}
133158
removed
134159
}

‎shared/src/commonMain/kotlin/dev/arkbuilders/drop/di/RepositoriesModule.kt‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,21 @@ val repositoriesModule =
1919
single { TransferSessionLocalDataSource(get()) }
2020

2121
single<ProfileRepo> { ProfileRepoImpl(get()) }
22-
single<SendSessionRepo> { SendSessionRepoImpl(get(), get(), get(), get<FirebaseReporter>()) }
23-
single<ReceiveSessionRepo> { ReceiveSessionRepoImpl(get(), get(), get(), get<FirebaseReporter>()) }
22+
single<SendSessionRepo> {
23+
SendSessionRepoImpl(
24+
get(),
25+
get(),
26+
get(),
27+
get<FirebaseReporter>(),
28+
)
29+
}
30+
single<ReceiveSessionRepo> {
31+
ReceiveSessionRepoImpl(
32+
get(),
33+
get(),
34+
get(),
35+
get<FirebaseReporter>(),
36+
)
37+
}
2438
single<TransferSessionRepo> { TransferSessionRepoImpl(get()) }
2539
}

‎shared/src/commonMain/kotlin/dev/arkbuilders/drop/di/ViewModelModule.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package dev.arkbuilders.drop.di
22

3+
import dev.arkbuilders.drop.instrumentation.FirebaseReporter
34
import dev.arkbuilders.drop.presentation.edit.EditProfileViewModel
45
import dev.arkbuilders.drop.presentation.history.HistoryViewModel
56
import dev.arkbuilders.drop.presentation.home.HomeViewModel
67
import dev.arkbuilders.drop.presentation.receive.ReceiveViewModel
78
import dev.arkbuilders.drop.presentation.send.SendViewModel
8-
import dev.arkbuilders.drop.instrumentation.FirebaseReporter
99
import org.koin.core.module.dsl.viewModel
1010
import org.koin.dsl.module
1111

0 commit comments

Comments
 (0)