launchdarkly
diff --git a/‎.circleci/config.yml‎
Lines changed: 18 additions & 13 deletions b/‎.circleci/config.yml‎
Lines changed: 18 additions & 13 deletions
diff --git a/‎build.gradle‎
Lines changed: 1 addition & 6 deletions b/‎build.gradle‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎contract-tests/src/main/java/com/launchdarkly/sdk/android/LDClientControl.java‎
Lines changed: 0 additions & 21 deletions b/‎contract-tests/src/main/java/com/launchdarkly/sdk/android/LDClientControl.java‎
Lines changed: 0 additions & 21 deletions
diff --git a/‎contract-tests/src/main/java/com/launchdarkly/sdktest/SdkClientEntity.java‎
Lines changed: 8 additions & 4 deletions b/‎contract-tests/src/main/java/com/launchdarkly/sdktest/SdkClientEntity.java‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎launchdarkly-android-client-sdk/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎launchdarkly-android-client-sdk/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/DefaultUserManagerTest.java‎
Lines changed: 14 additions & 41 deletions b/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/DefaultUserManagerTest.java‎
Lines changed: 14 additions & 41 deletions
diff --git a/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/FlagBuilder.java‎
Lines changed: 2 additions & 2 deletions b/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/FlagBuilder.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/FlagStoreTest.java‎
Lines changed: 3 additions & 3 deletions b/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/FlagStoreTest.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientTest.java‎
Lines changed: 2 additions & 2 deletions b/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientTest.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/SharedPrefsFlagStoreTest.java‎
Lines changed: 28 additions & 16 deletions b/‎launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/SharedPrefsFlagStoreTest.java‎
Lines changed: 28 additions & 16 deletions
@@ -15,26 +15,31 @@ workflows:
                 # - 21 - TODO: EasyMock makes our tests fail
                 - 25
                 # - 29 - TODO: offline tests fail
+# Contract tests are temporarily disabled for API 31 and API 33 due to a degree of
+# test instability that impedes development. Currently there are two common failure
+# modes: SDK initialization times out, or SDK initialization completes immediately
+# without acquiring any data because the emulator reports no network availability.
+# These do not appear correlated to any actual SDK logic flaw.
       - contract-tests:
           matrix:
             parameters:
               api-level:
                 - 21
                 - 25
                 - 30
-                - 31
-      # "default" images are faster than "google_apis" images, but are otherwise equivalent for our purposes.
-      # however, there are no "default" images for Android 32+, so as a workaround we have a separate matrix
-      # for Android 32+
-      - contract-tests:
-          matrix:
-            parameters:
-              api-level:
-                - 33
-              system-image-type:
-                - google_apis
-              resource-class:
-                - xlarge
+#                - 31
+      # # "default" images are faster than "google_apis" images, but are otherwise equivalent for our purposes.
+      # # however, there are no "default" images for Android 32+, so as a workaround we have a separate matrix
+      # # for Android 32+
+      # - contract-tests:
+      #     matrix:
+      #       parameters:
+      #         api-level:
+      #           - 33
+      #         system-image-type:
+      #           - google_apis
+      #         resource-class:
+      #           - xlarge
 
 commands:
   check-emulator-available:
 
@@ -64,9 +64,4 @@ nexusPublishing {
     repositories {
         sonatype()
     }
-
-    transitionCheckOptions {
-        maxRetries.set(20)
-        delayBetween.set(Duration.ofMillis(3000))
-    }
-}
+}
@@ -6,7 +6,6 @@
 import com.launchdarkly.sdk.android.LaunchDarklyException;
 import com.launchdarkly.sdk.android.LDClient;
 import com.launchdarkly.sdk.android.LDConfig;
-import com.launchdarkly.sdk.android.LDClientControl;
 
 import com.launchdarkly.sdktest.Representations.AliasEventParams;
 import com.launchdarkly.sdktest.Representations.CommandParams;
@@ -45,8 +44,6 @@ public class SdkClientEntity {
 
   public SdkClientEntity(Application application, CreateInstanceParams params) {
     Timber.i("Creating client for %s", params.tag);
-    LDClientControl.resetInstances();
-    Timber.i("Reset global state to allow for another client");
     LDConfig config = buildSdkConfig(params.configuration);
     // Each new client will plant a new Timber tree, so we uproot any existing ones
     // to avoid spamming stdout with duplicate log lines
@@ -70,6 +67,9 @@ public SdkClientEntity(Application application, CreateInstanceParams params) {
       this.client = LDClient.get();
       if (!client.isInitialized() && !params.configuration.initCanFail) {
         // If `initCanFail` is true, we can proceed with an uninitialized client
+        try {
+          client.close();
+        } catch (IOException e) {}
         throw new RuntimeException("client initialization failed or timed out");
       }
     } catch (LaunchDarklyException e) {
@@ -171,7 +171,11 @@ private EvaluateAllFlagsResponse doEvaluateAll(EvaluateAllFlagsParams params) {
   }
 
   private void doIdentifyEvent(IdentifyEventParams params) {
-    client.identify(params.user);
+    try {
+      client.identify(params.user).get();
+    } catch (ExecutionException | InterruptedException e) {
+      throw new RuntimeException("Error waiting for identify", e);
+    }
   }
 
   private void doCustomEvent(CustomEventParams params) {
 
@@ -55,7 +55,7 @@ configurations {
 ext {}
 ext.versions = [
     "androidAnnotation": "1.2.0",
-    "eventsource": "1.11.2",
+    "eventsource": "1.11.3",
     "gson": "2.8.9",
     "jacksonCore": "2.10.5",
     "jacksonDatabind": "2.10.5.1",
 
@@ -195,8 +195,11 @@ public void testDeleteFlag() throws ExecutionException {
         AwaitableCallback<Void> deleteAwait = new AwaitableCallback<>();
         userManager.deleteCurrentUserFlag("{\"key\":\"stringFlag1\",\"version\":16}", deleteAwait);
         deleteAwait.await();
-        assertNull(flagStore.getFlag("stringFlag1"));
-        assertEquals(true, flagStore.getFlag("boolFlag1").getValue().booleanValue());
+        Flag updated = flagStore.getFlag("stringFlag1");
+        assertNotNull(updated);
+        assertEquals("stringFlag1", updated.getKey());
+        assertEquals(16, updated.getVersion());
+        assertTrue(updated.isDeleted());
 
         deleteAwait.reset();
         userManager.deleteCurrentUserFlag("{\"key\":\"nonExistentFlag\",\"version\":16,\"value\":false}", deleteAwait);
@@ -274,7 +277,8 @@ public void testDeleteWithVersion() throws ExecutionException {
         userManager.deleteCurrentUserFlag("{\"key\":\"stringFlag1\",\"version\":127}", awaitableCallback);
         awaitableCallback.await();
         awaitableCallback.reset();
-        assertNull(flagStore.getFlag("stringFlag1"));
+        assertNotNull(flagStore.getFlag("stringFlag1"));
+        assertTrue(flagStore.getFlag("stringFlag1").isDeleted());
 
         userManager.deleteCurrentUserFlag("{\"key\":\"nonExistent\",\"version\":1}", awaitableCallback);
         awaitableCallback.await();
@@ -323,32 +327,13 @@ public void testPatchSucceedsForMissingVersionInPatch() throws ExecutionExceptio
         FlagStore flagStore = userManager.getCurrentUserFlagStore();
         AwaitableCallback<Void> awaitableCallback = new AwaitableCallback<>();
 
-        // version does not exist in shared preferences and patch.
-        // ---------------------------
-        //// case 1: value does not exist in shared preferences.
-        userManager.patchCurrentUserFlags("{\"key\":\"flag1\",\"value\":\"value-from-patch\"}", awaitableCallback);
-        awaitableCallback.await();
-        awaitableCallback.reset();
-        Flag flag1 = flagStore.getFlag("flag1");
-        assertEquals("value-from-patch", flag1.getValue().stringValue());
-        assertNull(flag1.getVersion());
-
-        //// case 2: value exists in shared preferences without version.
-        userManager.putCurrentUserFlags("{\"flag1\": {\"value\": \"value1\"}}", null);
-        userManager.patchCurrentUserFlags("{\"key\":\"flag1\",\"value\":\"value-from-patch\"}", awaitableCallback);
-        awaitableCallback.await();
-        awaitableCallback.reset();
-        flag1 = flagStore.getFlag("flag1");
-        assertEquals("value-from-patch", flag1.getValue().stringValue());
-        assertNull(flag1.getVersion());
-
         // version does not exist in shared preferences but exists in patch.
         // ---------------------------
         //// case 1: value does not exist in shared preferences.
         userManager.patchCurrentUserFlags("{\"key\":\"flag1\",\"version\":558,\"flagVersion\":3,\"value\":\"value-from-patch\",\"variation\":1,\"trackEvents\":false}", awaitableCallback);
         awaitableCallback.await();
         awaitableCallback.reset();
-        flag1 = flagStore.getFlag("flag1");
+        Flag flag1 = flagStore.getFlag("flag1");
         assertEquals("value-from-patch", flag1.getValue().stringValue());
         assertEquals(558, (int) flag1.getVersion());
         assertEquals(3, (int) flag1.getFlagVersion());
@@ -361,21 +346,9 @@ public void testPatchSucceedsForMissingVersionInPatch() throws ExecutionExceptio
         awaitableCallback.reset();
         flag1 = flagStore.getFlag("flag1");
         assertEquals("value-from-patch", flag1.getValue().stringValue());
-        assertEquals(558, (int) flag1.getVersion());
-        assertEquals(3, (int) flag1.getFlagVersion());
-        assertEquals(3, (int) flag1.getVersionForEvents());
-
-        // version exists in shared preferences but does not exist in patch.
-        // ---------------------------
-        userManager.putCurrentUserFlags("{\"flag1\": {\"version\": 558, \"flagVersion\": 110,\"value\": \"value1\", \"variation\": 1, \"trackEvents\": false}}", null);
-        userManager.patchCurrentUserFlags("{\"key\":\"flag1\",\"value\":\"value-from-patch\"}", awaitableCallback);
-        awaitableCallback.await();
-        awaitableCallback.reset();
-        flag1 = flagStore.getFlag("flag1");
-        assertEquals("value-from-patch", flag1.getValue().stringValue());
-        assertNull(flag1.getVersion());
-        assertNull(flag1.getFlagVersion());
-        assertNull(flag1.getVersionForEvents());
+        assertEquals(558, flag1.getVersion());
+        assertEquals(Integer.valueOf(3), flag1.getFlagVersion());
+        assertEquals(3, flag1.getVersionForEvents());
 
         // version exists in shared preferences and patch.
         // ---------------------------
@@ -384,9 +357,9 @@ public void testPatchSucceedsForMissingVersionInPatch() throws ExecutionExceptio
         awaitableCallback.await();
         flag1 = flagStore.getFlag("flag1");
         assertEquals("value-from-patch", flag1.getValue().stringValue());
-        assertEquals(559, (int) flag1.getVersion());
-        assertEquals(3, (int) flag1.getFlagVersion());
-        assertEquals(3, (int) flag1.getVersionForEvents());
+        assertEquals(559, flag1.getVersion());
+        assertEquals(Integer.valueOf(3), flag1.getFlagVersion());
+        assertEquals(3, flag1.getVersionForEvents());
     }
 
     @Test
 
@@ -10,7 +10,7 @@ public class FlagBuilder {
     @NonNull
     private String key;
     private LDValue value = null;
-    private Integer version = null;
+    private int version;
     private Integer flagVersion = null;
     private Integer variation = null;
     private Boolean trackEvents = null;
@@ -27,7 +27,7 @@ public FlagBuilder value(LDValue value) {
         return this;
     }
 
-    public FlagBuilder version(Integer version) {
+    public FlagBuilder version(int version) {
         this.version = version;
         return this;
     }
 
@@ -51,7 +51,7 @@ public boolean matches(Object argument) {
                         Objects.equals(flag.getVersion(), received.getVersion()) &&
                         Objects.equals(flag.getFlagVersion(), received.getFlagVersion()) &&
                         Objects.equals(flag.getVariation(), received.getVariation()) &&
-                        Objects.equals(flag.getTrackEvents(), received.getTrackEvents()) &&
+                        Objects.equals(flag.isTrackEvents(), received.isTrackEvents()) &&
                         Objects.equals(flag.isTrackReason(), received.isTrackReason()) &&
                         Objects.equals(flag.getDebugEventsUntilDate(),
                                 received.getDebugEventsUntilDate()) &&
@@ -79,7 +79,7 @@ private void assertExpectedFlag(Flag expected, Flag received) {
         assertEquals(expected.getVersion(), received.getVersion());
         assertEquals(expected.getFlagVersion(), received.getFlagVersion());
         assertEquals(expected.getVariation(), received.getVariation());
-        assertEquals(expected.getTrackEvents(), received.getTrackEvents());
+        assertEquals(expected.isTrackEvents(), received.isTrackEvents());
         assertEquals(expected.isTrackReason(), received.isTrackReason());
         assertEquals(expected.getDebugEventsUntilDate(), received.getDebugEventsUntilDate());
         assertEquals(expected.getReason(), received.getReason());
@@ -204,7 +204,7 @@ public void mockFlagDeleteBehavior() {
 
     @Test
     public void testUnregisterStoreUpdate() {
-        final Flag initialFlag = new FlagBuilder("flag").build();
+        final Flag initialFlag = new FlagBuilder("flag").version(10).build();
 
         final FlagUpdate mockCreate = strictMock(FlagUpdate.class);
         expect(mockCreate.flagToUpdate()).andReturn("flag");
 
@@ -602,7 +602,7 @@ public void variationFlagTrackReasonGeneratesEventWithReason() throws IOExceptio
             TestUtil.markMigrationComplete(application);
             EvaluationReason testReason = EvaluationReason.off();
             FlagStore flagStore = new SharedPrefsFlagStoreFactory(application).createFlagStore(mobileKey + DefaultUserManager.sharedPrefs(ldUser));
-            flagStore.applyFlagUpdate(new FlagBuilder("track-reason-flag").trackEvents(true).trackReason(true).reason(testReason).build());
+            flagStore.applyFlagUpdate(new FlagBuilder("track-reason-flag").version(10).trackEvents(true).trackReason(true).reason(testReason).build());
 
             try (LDClient client = LDClient.init(application, ldConfig, ldUser, 0)) {
                 client.boolVariation("track-reason-flag", false);
@@ -615,7 +615,7 @@ public void variationFlagTrackReasonGeneratesEventWithReason() throws IOExceptio
                 assertEquals("track-reason-flag", event.key);
                 assertEquals("userKey", event.userKey);
                 assertNull(event.variation);
-                assertNull(event.version);
+                assertEquals(Integer.valueOf(10), event.version);
                 assertFalse(event.value.booleanValue());
                 assertFalse(event.defaultVal.booleanValue());
                 assertEquals(testReason, event.reason);
 
@@ -15,6 +15,9 @@
 import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class SharedPrefsFlagStoreTest extends FlagStoreTest {
@@ -34,51 +37,60 @@ public FlagStore createFlagStore(String identifier) {
     }
 
     @Test
-    public void deletesVersions() {
+    public void deletesVersionAndStoresDeletedItemPlaceholder() {
         final Flag key1 = new FlagBuilder("key1").version(12).build();
 
         final SharedPrefsFlagStore flagStore = new SharedPrefsFlagStore(testApplication, "abc");
         flagStore.applyFlagUpdates(Collections.<FlagUpdate>singletonList(key1));
-        flagStore.applyFlagUpdate(new DeleteFlagResponse(key1.getKey(), null));
+        flagStore.applyFlagUpdate(new DeleteFlagResponse(key1.getKey(), 13));
 
-        Assert.assertNull(flagStore.getFlag(key1.getKey()));
+        Flag updated = flagStore.getFlag(key1.getKey());
+        assertNotNull(updated);
+        assertEquals(key1.getKey(), updated.getKey());
+        assertEquals(13, updated.getVersion());
+        assertTrue(updated.isDeleted());
     }
 
     @Test
-    public void updatesVersions() {
+    public void doesNotDeleteIfDeletionVersionIsLessThanOrEqualToExistingVersion() {
         final Flag key1 = new FlagBuilder("key1").version(12).build();
-        final Flag updatedKey1 = new FlagBuilder(key1.getKey()).version(15).build();
 
         final SharedPrefsFlagStore flagStore = new SharedPrefsFlagStore(testApplication, "abc");
         flagStore.applyFlagUpdates(Collections.<FlagUpdate>singletonList(key1));
-
-        flagStore.applyFlagUpdate(updatedKey1);
-
-        assertEquals(flagStore.getFlag(key1.getKey()).getVersion(), 15, 0);
+        flagStore.applyFlagUpdate(new DeleteFlagResponse(key1.getKey(), 11));
+        flagStore.applyFlagUpdate(new DeleteFlagResponse(key1.getKey(), 12));
+
+        Flag updated = flagStore.getFlag(key1.getKey());
+        assertEquals(key1.getKey(), updated.getKey());
+        assertEquals(key1.getVersion(), updated.getVersion());
+        assertEquals(key1.getValue(), updated.getValue());
+        assertFalse(updated.isDeleted());
     }
 
     @Test
-    public void deletesFlagVersions() {
-        final Flag key1 = new FlagBuilder("key1").flagVersion(12).build();
+    public void updatesVersions() {
+        final Flag key1 = new FlagBuilder("key1").version(12).build();
+        final Flag updatedKey1 = new FlagBuilder(key1.getKey()).version(15).build();
 
         final SharedPrefsFlagStore flagStore = new SharedPrefsFlagStore(testApplication, "abc");
         flagStore.applyFlagUpdates(Collections.<FlagUpdate>singletonList(key1));
-        flagStore.applyFlagUpdate(new DeleteFlagResponse(key1.getKey(), null));
 
-        Assert.assertNull(flagStore.getFlag(key1.getKey()));
+        flagStore.applyFlagUpdate(updatedKey1);
+
+        assertEquals(15, flagStore.getFlag(key1.getKey()).getVersion());
     }
 
     @Test
     public void updatesFlagVersions() {
-        final Flag key1 = new FlagBuilder("key1").flagVersion(12).build();
-        final Flag updatedKey1 = new FlagBuilder(key1.getKey()).flagVersion(15).build();
+        final Flag key1 = new FlagBuilder("key1").version(100).flagVersion(12).build();
+        final Flag updatedKey1 = new FlagBuilder(key1.getKey()).version(101).flagVersion(15).build();
 
         final SharedPrefsFlagStore flagStore = new SharedPrefsFlagStore(testApplication, "abc");
         flagStore.applyFlagUpdates(Collections.<FlagUpdate>singletonList(key1));
 
         flagStore.applyFlagUpdate(updatedKey1);
 
-        assertEquals(flagStore.getFlag(key1.getKey()).getFlagVersion(), 15, 0);
+        assertEquals(Integer.valueOf(15), flagStore.getFlag(key1.getKey()).getFlagVersion());
     }
 
     @Test