File tree Expand file tree Collapse file tree
modules/navigator/src/main/kotlin/com/w2sv/navigator Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11package com.w2sv.navigator
22
3- import com.w2sv.navigator.di .MoveSummaryChannel
3+ import com.w2sv.navigator.postmove .MoveSummaryChannel
44import com.w2sv.navigator.postmove.MoveSummaryListener
55import javax.inject.Inject
66import kotlinx.coroutines.flow.consumeAsFlow
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ package com.w2sv.navigator.di
33import android.content.ContentResolver
44import android.content.Context
55import com.w2sv.navigator.FileNavigator
6- import com.w2sv.navigator.postmove.MoveOperationSummary
6+ import com.w2sv.navigator.postmove.MoveSummaryChannel
77import dagger.Module
88import dagger.Provides
99import dagger.hilt.InstallIn
@@ -13,8 +13,6 @@ import javax.inject.Singleton
1313import kotlinx.coroutines.channels.Channel
1414import kotlinx.coroutines.flow.StateFlow
1515
16- internal typealias MoveSummaryChannel = Channel <MoveOperationSummary >
17-
1816@InstallIn(SingletonComponent ::class )
1917@Module
2018internal object FileNavigatorModule {
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import android.os.Parcelable
66import com.w2sv.androidutils.content.getParcelableCompat
77import com.w2sv.androidutils.content.intent
88import com.w2sv.common.logging.LoggingUnboundService
9- import com.w2sv.navigator.di .MoveSummaryChannel
9+ import com.w2sv.navigator.postmove .MoveSummaryChannel
1010import com.w2sv.navigator.domain.moving.MoveDestination
1111import com.w2sv.navigator.domain.moving.MoveOperation
1212import com.w2sv.navigator.postmove.MoveOperationSummary
Original file line number Diff line number Diff line change @@ -2,12 +2,13 @@ package com.w2sv.navigator.moving
22
33import android.content.Context
44import com.w2sv.common.di.ApplicationIoScope
5- import com.w2sv.navigator.di.MoveSummaryChannel
65import com.w2sv.navigator.domain.moving.MoveOperation
76import com.w2sv.navigator.postmove.MoveOperationSummary
8- import javax.inject.Inject
7+ import com.w2sv.navigator.postmove.MoveSummaryChannel
8+ import com.w2sv.navigator.postmove.loggingTrySend
99import kotlinx.coroutines.CoroutineScope
1010import kotlinx.coroutines.launch
11+ import javax.inject.Inject
1112
1213internal class FileMover @Inject constructor(
1314 private val moveSummaryChannel : MoveSummaryChannel ,
@@ -16,7 +17,7 @@ internal class FileMover @Inject constructor(
1617 operator fun invoke (operation : MoveOperation , context : Context ) {
1718 scope.launch {
1819 operation.file.moveTo(destination = operation.destination, context = context) { result ->
19- moveSummaryChannel.trySend (MoveOperationSummary (result, operation))
20+ moveSummaryChannel.loggingTrySend (MoveOperationSummary (result, operation))
2021 }
2122 }
2223 }
Original file line number Diff line number Diff line change 11package com.w2sv.navigator.moving.activity
22
33import android.app.Activity
4- import com.w2sv.navigator.di.MoveSummaryChannel
5- import com.w2sv.navigator.postmove.MoveOperationSummary
64import com.w2sv.navigator.domain.moving.MoveResult
5+ import com.w2sv.navigator.postmove.MoveOperationSummary
6+ import com.w2sv.navigator.postmove.MoveSummaryChannel
7+ import com.w2sv.navigator.postmove.loggingTrySend
78import javax.inject.Inject
89
910class MoveActivityFinisher @Inject constructor(private val moveSummaryChannel : MoveSummaryChannel ) {
1011
1112 fun finishOnError (activity : Activity , error : MoveResult ) {
12- moveSummaryChannel.trySend (MoveOperationSummary (error))
13+ moveSummaryChannel.loggingTrySend (MoveOperationSummary (error))
1314 activity.finishAndRemoveTask()
1415 }
1516}
Original file line number Diff line number Diff line change 1+ package com.w2sv.navigator.postmove
2+
3+ import kotlinx.coroutines.channels.Channel
4+ import kotlinx.coroutines.channels.onFailure
5+ import slimber.log.e
6+ import slimber.log.i
7+
8+ internal typealias MoveSummaryChannel = Channel <MoveOperationSummary >
9+
10+ fun MoveSummaryChannel.loggingTrySend (operationSummary : MoveOperationSummary ) {
11+ i { " Try sending $operationSummary via MoveSummaryChannel" }
12+ trySend(operationSummary).onFailure { error ->
13+ e { " Failed to send summary: $error " }
14+ }
15+ }
You can’t perform that action at this time.
0 commit comments