Validated against 4.0 branch

Author: bmeike

android-ktx/lib/build.gradle

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017, 2018, 2019, 2020, 2024 Couchbase, Inc.
+// Copyright (c) 2017, 2018, 2019, 2024 Couchbase, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

android/lib/src/main/java/com/couchbase/lite/Replicator.java

@@ -15,6 +15,7 @@
 //
 package com.couchbase.lite;
 
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -53,6 +54,7 @@ public Replicator(@NonNull ReplicatorConfiguration config) {
             : new AndroidConnectivityObserver(mgr, Replicator.this::getC4Replicator);
     }
 
+    @GuardedBy("getDbLock()")
     @Override
     @NonNull
     protected C4Replicator createReplicatorForTarget(@NonNull Endpoint target) throws LiteCoreException {

java/lib/src/main/java/com/couchbase/lite/Replicator.java

@@ -15,6 +15,7 @@
 //
 package com.couchbase.lite;
 
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -34,6 +35,7 @@ public final class Replicator extends AbstractReplicator {
     @VisibleForTesting
     Replicator(@Nullable NetworkConnectivityManager ignore, @NonNull ReplicatorConfiguration config) { super(config); }
 
+    @GuardedBy("getDbLock()")
     @NonNull
     @Override
     protected C4Replicator createReplicatorForTarget(@NonNull Endpoint target) throws LiteCoreException {