refactor(navigator): simplify MoveOperationSummary

Author: w2sv

modules/navigator-domain/src/main/kotlin/com/w2sv/navigator/domain/moving/MoveOperationSummary.kt

@@ -3,7 +3,7 @@ package com.w2sv.navigator.di
 import android.content.ContentResolver
 import android.content.Context
 import com.w2sv.navigator.FileNavigator
-import com.w2sv.navigator.domain.moving.MoveOperationSummary
+import com.w2sv.navigator.postmove.MoveOperationSummary
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

modules/navigator/src/main/kotlin/com/w2sv/navigator/di/FileNavigatorModule.kt

@@ -9,7 +9,7 @@ import com.w2sv.common.logging.LoggingUnboundService
 import com.w2sv.navigator.di.MoveSummaryChannel
 import com.w2sv.navigator.domain.moving.MoveDestination
 import com.w2sv.navigator.domain.moving.MoveOperation
-import com.w2sv.navigator.domain.moving.MoveOperationSummary
+import com.w2sv.navigator.postmove.MoveOperationSummary
 import com.w2sv.navigator.domain.moving.MoveResult
 import com.w2sv.navigator.domain.notifications.NotificationEvent
 import com.w2sv.navigator.domain.notifications.NotificationEventHandler

modules/navigator/src/main/kotlin/com/w2sv/navigator/moving/BatchMoveService.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import com.w2sv.common.di.ApplicationIoScope
 import com.w2sv.navigator.di.MoveSummaryChannel
 import com.w2sv.navigator.domain.moving.MoveOperation
-import com.w2sv.navigator.domain.moving.MoveOperationSummary
+import com.w2sv.navigator.postmove.MoveOperationSummary
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

modules/navigator/src/main/kotlin/com/w2sv/navigator/moving/FileMover.kt

@@ -2,14 +2,14 @@ package com.w2sv.navigator.moving.activity
 
 import android.app.Activity
 import com.w2sv.navigator.di.MoveSummaryChannel
-import com.w2sv.navigator.domain.moving.MoveOperationSummary
+import com.w2sv.navigator.postmove.MoveOperationSummary
 import com.w2sv.navigator.domain.moving.MoveResult
 import javax.inject.Inject
 
 class MoveActivityFinisher @Inject constructor(private val moveSummaryChannel: MoveSummaryChannel) {
 
     fun finishOnError(activity: Activity, error: MoveResult) {
-        moveSummaryChannel.trySend(MoveOperationSummary.EarlyCancellation(error))
+        moveSummaryChannel.trySend(MoveOperationSummary(error))
         activity.finishAndRemoveTask()
     }
 }

modules/navigator/src/main/kotlin/com/w2sv/navigator/moving/activity/MoveActivityFinisher.kt

@@ -0,0 +1,22 @@
+package com.w2sv.navigator.postmove
+
+import android.content.Context
+import com.w2sv.common.util.makeIf
+import com.w2sv.navigator.domain.moving.MoveOperation
+import com.w2sv.navigator.domain.moving.MoveOperationFeedback
+import com.w2sv.navigator.domain.moving.MoveResult
+import com.w2sv.navigator.domain.notifications.CancelNotificationEvent
+
+data class MoveOperationSummary(val result: MoveResult, val operation: MoveOperation? = null) {
+    val cancelNavigateFileNotificationEvent: CancelNotificationEvent?
+        get() = operation?.destinationSelectionManner?.cancelNotificationEvent?.takeIf { result.cancelNotification }
+
+    private val isPartOfBatch
+        get() = operation?.isPartOfBatch == true
+
+    /**
+     * @return [MoveOperationFeedback] corresponding to the [result] if the operation is NOT part of a batch.
+     */
+    fun makeFeedback(context: Context): MoveOperationFeedback? =
+        makeIf(!isPartOfBatch) { result.makeFeedback(context, operation) }
+}

modules/navigator/src/main/kotlin/com/w2sv/navigator/postmove/MoveOperationSummary.kt

@@ -5,20 +5,19 @@ import com.w2sv.androidutils.widget.showToast
 import com.w2sv.common.di.ApplicationIoScope
 import com.w2sv.domain.repository.NavigatorConfigDataSource
 import com.w2sv.domain.usecase.InsertMovedFileUseCase
-import com.w2sv.navigator.domain.moving.NavigatableFile
 import com.w2sv.navigator.domain.moving.MoveOperation
 import com.w2sv.navigator.domain.moving.MoveOperationFeedback
-import com.w2sv.navigator.domain.moving.MoveOperationSummary
 import com.w2sv.navigator.domain.moving.MoveResult
+import com.w2sv.navigator.domain.moving.NavigatableFile
 import com.w2sv.navigator.domain.notifications.NotificationEventHandler
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.time.LocalDateTime
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import slimber.log.i
+import java.time.LocalDateTime
+import javax.inject.Inject
 
 internal class MoveSummaryListener @Inject constructor(
     private val insertMovedFileUseCase: InsertMovedFileUseCase,
@@ -38,11 +37,12 @@ internal class MoveSummaryListener @Inject constructor(
             }
         }
 
-        // TODO meh
-        if (summary is MoveOperationSummary.WithOperation) {
+        // If operation present trigger specific actions for results that demand them
+        // TODO model should be such that the operation can't be null on Success or MoveDestinationNotFound
+        summary.operation?.let { operation ->
             when (summary.result) {
-                is MoveResult.Success -> onSuccess(summary.operation)
-                is MoveResult.MoveDestinationNotFound -> onMoveDestinationNotFound(summary.operation)
+                is MoveResult.Success -> onSuccess(operation)
+                is MoveResult.MoveDestinationNotFound -> onMoveDestinationNotFound(operation)
                 else -> Unit
             }
         }