Skip to content

Commit 3c59a61

Browse files
committed
Use threadUnsafeLazy
1 parent a3c2c5d commit 3c59a61

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

app/src/main/kotlin/com/w2sv/filenavigator/ui/theme/Theme.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.graphics.Color
1111
import androidx.compose.ui.platform.LocalContext
1212
import com.w2sv.filenavigator.ui.LocalUseDarkTheme
13+
import com.w2sv.kotlinutils.threadUnsafeLazy
1314

1415
@SuppressLint("NewApi")
1516
@Composable
@@ -40,7 +41,7 @@ fun AppTheme(
4041
}
4142
}
4243

43-
private val staticColorSchemeDark by lazy {
44+
private val staticColorSchemeDark by threadUnsafeLazy {
4445
ColorScheme(
4546
primary = Color(0.29803923f, 0.8509804f, 0.88235295f, 1.0f),
4647
onPrimary = Color(0.0f, 0.21568628f, 0.22352941f, 1.0f),
@@ -89,7 +90,7 @@ private val staticColorSchemeDark by lazy {
8990
)
9091
}
9192

92-
private val staticColorSchemeLight by lazy {
93+
private val staticColorSchemeLight by threadUnsafeLazy {
9394
ColorScheme(
9495
primary = Color(0.0f, 0.4117647f, 0.43137255f, 1.0f),
9596
onPrimary = Color(1.0f, 1.0f, 1.0f, 1.0f),

core/navigator/src/main/kotlin/com/w2sv/navigator/moving/quick/QuickMoveDestinationAccessPermissionQueryActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.w2sv.common.util.takePersistableReadAndWriteUriPermission
1212
import com.w2sv.core.navigator.R
1313
import com.w2sv.domain.repository.NavigatorConfigDataSource
1414
import com.w2sv.domain.repository.PreferencesRepository
15+
import com.w2sv.kotlinutils.threadUnsafeLazy
1516
import com.w2sv.navigator.moving.MoveBroadcastReceiver
1617
import com.w2sv.navigator.moving.model.MoveBundle
1718
import com.w2sv.navigator.moving.model.MoveResult
@@ -38,7 +39,7 @@ internal class QuickMoveDestinationAccessPermissionQueryActivity : DialogHosting
3839
@GlobalScope(AppDispatcher.IO)
3940
lateinit var globalIoScope: CoroutineScope
4041

41-
private val moveBundle by lazy {
42+
private val moveBundle by threadUnsafeLazy {
4243
MoveBundle.fromIntent<MoveBundle.QuickMove>(intent)
4344
}
4445

core/navigator/src/main/kotlin/com/w2sv/navigator/notifications/appnotifications/batchmove/BatchMoveDestinationPickerActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import android.os.Parcelable
55
import androidx.activity.result.contract.ActivityResultContracts
66
import com.w2sv.androidutils.os.getParcelableCompat
77
import com.w2sv.common.util.DocumentUri
8+
import com.w2sv.common.util.log
89
import com.w2sv.common.util.takePersistableReadAndWriteUriPermission
10+
import com.w2sv.kotlinutils.threadUnsafeLazy
911
import com.w2sv.navigator.moving.api.activity.AbstractDestinationPickerActivity
1012
import com.w2sv.navigator.moving.batch.BatchMoveBroadcastReceiver
1113
import com.w2sv.navigator.moving.model.DestinationSelectionManner
@@ -21,8 +23,8 @@ import slimber.log.i
2123
@AndroidEntryPoint
2224
internal class BatchMoveDestinationPickerActivity : AbstractDestinationPickerActivity() {
2325

24-
private val args: Args by lazy {
25-
intent.getParcelableCompat<Args>(AbstractDestinationPickerActivity.Args.EXTRA)!!
26+
private val args: Args by threadUnsafeLazy {
27+
intent.getParcelableCompat<Args>(AbstractDestinationPickerActivity.Args.EXTRA)!!.log()
2628
}
2729

2830
override fun launchPicker() {
@@ -52,8 +54,6 @@ internal class BatchMoveDestinationPickerActivity : AbstractDestinationPickerAct
5254
NavigatorMoveDestination.Directory.fromTreeUri(this, treeUri)
5355
?: return sendMoveResultBundleAndFinishAndRemoveTask(MoveResult.InternalError)
5456

55-
i { args.toString() }
56-
5757
BatchMoveBroadcastReceiver.Companion.sendBroadcast(
5858
args = BatchMoveBroadcastReceiver.Args(
5959
batchMoveBundles = args.moveFilesWithNotificationResources.map {

core/navigator/src/main/kotlin/com/w2sv/navigator/notifications/appnotifications/movefile/FileDeletionActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.lifecycle.coroutineScope
77
import com.w2sv.androidutils.res.getHtmlFormattedText
88
import com.w2sv.androidutils.widget.showToast
99
import com.w2sv.core.navigator.R
10+
import com.w2sv.kotlinutils.threadUnsafeLazy
1011
import com.w2sv.navigator.moving.model.MoveFile
1112
import com.w2sv.navigator.notifications.NotificationResources
1213
import com.w2sv.navigator.shared.DialogHostingActivity
@@ -27,11 +28,11 @@ import kotlinx.coroutines.launch
2728
*/
2829
internal class FileDeletionActivity : DialogHostingActivity() {
2930

30-
private val moveFile by lazy {
31+
private val moveFile by threadUnsafeLazy {
3132
MoveFile.fromIntent(intent)
3233
}
3334

34-
private val notificationResources by lazy {
35+
private val notificationResources by threadUnsafeLazy {
3536
NotificationResources.Companion.fromIntent(intent)
3637
}
3738

core/navigator/src/main/kotlin/com/w2sv/navigator/notifications/appnotifications/movefile/FileDestinationPickerActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import androidx.lifecycle.lifecycleScope
99
import com.w2sv.androidutils.os.getParcelableCompat
1010
import com.w2sv.common.util.DocumentUri
1111
import com.w2sv.common.util.documentUri
12-
import com.w2sv.common.util.emit
1312
import com.w2sv.common.util.log
1413
import com.w2sv.common.util.takePersistableReadAndWriteUriPermission
14+
import com.w2sv.kotlinutils.coroutines.flow.emit
15+
import com.w2sv.kotlinutils.threadUnsafeLazy
1516
import com.w2sv.navigator.moving.MoveBroadcastReceiver
1617
import com.w2sv.navigator.moving.api.activity.AbstractDestinationPickerActivity
1718
import com.w2sv.navigator.moving.model.DestinationSelectionManner
@@ -33,7 +34,7 @@ internal class FileDestinationPickerActivity : AbstractDestinationPickerActivity
3334
@Inject
3435
lateinit var blacklistedMediaUris: MutableSharedFlow<MediaIdWithMediaType>
3536

36-
private val args: Args by lazy {
37+
private val args: Args by threadUnsafeLazy {
3738
intent.getParcelableCompat<Args>(AbstractDestinationPickerActivity.Args.EXTRA)!!
3839
}
3940

0 commit comments

Comments
 (0)