Merge pull request #23 from launchdarkly/2.0.2

2.0.2

Author: drichelson

CHANGELOG.md

@@ -3,6 +3,11 @@
 
 All notable changes to the LaunchDarkly Android SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.0.2] - 2017-05-03
+### Changed
+- Improved thread safety in UserManager when removing change listeners.
+- Streamlined SDK initialization.
+
 ## [2.0.1] - 2017-04-28
 ### Fixed
 - The `Future<LDClient>` returned from `LDClient.init` now also waits for the feature flag rules to be retrieved.

launchdarkly-android-client/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 allprojects {
     group = 'com.launchdarkly'
-    version = '2.0.1'
+    version = '2.0.2'
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }

launchdarkly-android-client/src/androidTest/java/com/launchdarkly/android/UserManagerTest.java

@@ -115,7 +115,8 @@ private Future<Void> setUser(String userKey, JsonObject flags) {
         ListenableFuture<JsonObject> jsonObjectFuture = Futures.immediateFuture(flags);
         expect(fetcher.fetch(user)).andReturn(jsonObjectFuture);
         replayAll();
-        Future<Void> future = userManager.setCurrentUser(user);
+        userManager.setCurrentUser(user);
+        Future<Void> future = userManager.updateCurrentUser();
         reset(fetcher);
         return future;
     }
@@ -128,8 +129,8 @@ private void setUserAndFailToFetchFlags(String userKey) throws InterruptedExcept
 
         expect(fetcher.fetch(user)).andReturn(failedFuture);
         replayAll();
-
-        Future<Void> future = userManager.setCurrentUser(user);
+        userManager.setCurrentUser(user);
+        Future<Void> future = userManager.updateCurrentUser();
         try {
             future.get();
         } catch (ExecutionException e) {

launchdarkly-android-client/src/main/java/com/launchdarkly/android/LDClient.java

@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -70,7 +69,7 @@ public static synchronized Future<LDClient> init(Application application, LDConf
             return settableFuture;
         }
         instance = new LDClient(application, config);
-        ListenableFuture<Void> userFuture = instance.userManager.setCurrentUser(user);
+        instance.userManager.setCurrentUser(user);
 
         if (instance.isOffline() || !isInternetConnected(application)) {
             settableFuture.set(instance);
@@ -82,9 +81,10 @@ public static synchronized Future<LDClient> init(Application application, LDConf
         ListenableFuture<Void> initFuture = instance.updateProcessor.start();
         instance.sendEvent(new IdentifyEvent(user));
 
-        return Futures.whenAllComplete(userFuture, initFuture).call(new Callable<LDClient>() {
+        // Transform initFuture so its result is the instance:
+        return Futures.transform(initFuture, new Function<Void, LDClient>() {
             @Override
-            public LDClient call() throws Exception {
+            public LDClient apply(Void input) {
                 return instance;
             }
         });
@@ -134,7 +134,7 @@ protected LDClient(final Application application, final LDConfig config) {
         this.config = config;
         this.isOffline = config.isOffline();
 
-        SharedPreferences instanceIdSharedPrefs = application.getSharedPreferences("id", Context.MODE_PRIVATE);
+        SharedPreferences instanceIdSharedPrefs = application.getSharedPreferences("LaunchDarkly-id", Context.MODE_PRIVATE);
 
         if (!instanceIdSharedPrefs.contains(INSTANCE_ID_KEY)) {
             String uuid = UUID.randomUUID().toString();
@@ -215,7 +215,8 @@ public synchronized Future<Void> identify(LDUser user) {
         if (user.getKey() == null) {
             Log.w(TAG, "identify called with null user or null user key!");
         }
-        Future<Void> doneFuture = userManager.setCurrentUser(user);
+        userManager.setCurrentUser(user);
+        Future<Void> doneFuture = userManager.updateCurrentUser();
         sendEvent(new IdentifyEvent(user));
         return doneFuture;
     }

launchdarkly-android-client/src/main/java/com/launchdarkly/android/UserManager.java

@@ -12,6 +12,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -26,7 +27,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Future;
 
 /**
  * Persists and retrieves feature flag values for different {@link LDUser}s.
@@ -51,13 +51,14 @@ class UserManager {
 
     private final Application application;
     // Maintains references enabling (de)registration of listeners for realtime updates
-    private final Multimap<String, Pair<FeatureFlagChangeListener, OnSharedPreferenceChangeListener>> listeners = ArrayListMultimap.create();
+    private final Multimap<String, Pair<FeatureFlagChangeListener, OnSharedPreferenceChangeListener>> listeners =
+            Multimaps.synchronizedMultimap(ArrayListMultimap.<String, Pair<FeatureFlagChangeListener,OnSharedPreferenceChangeListener>>create());
 
     // The current user- we'll always fetch this user from the response we get from the api
     private SharedPreferences currentUserSharedPrefs;
     private LDUser currentUser;
 
-    static UserManager init(Application application, FeatureFlagFetcher fetcher) {
+    static synchronized UserManager init(Application application, FeatureFlagFetcher fetcher) {
         if (instance != null) {
             return instance;
         }
@@ -91,12 +92,12 @@ SharedPreferences getCurrentUserSharedPrefs() {
      *
      * @param user
      */
-    ListenableFuture<Void> setCurrentUser(final LDUser user) {
+    void setCurrentUser(final LDUser user) {
         String userBase64 = user.getAsUrlSafeBase64();
         Log.d(TAG, "Setting current user to: [" + userBase64 + "] [" + userBase64ToJson(userBase64) + "]");
         currentUser = user;
         currentUserSharedPrefs = loadSharedPrefsForUser(userBase64);
-        ListenableFuture<Void> updateFuture = updateCurrentUser();
+
         usersSharedPrefs.edit()
                 .putLong(userBase64, System.currentTimeMillis())
                 .apply();
@@ -111,8 +112,6 @@ ListenableFuture<Void> setCurrentUser(final LDUser user) {
                     .remove(removed)
                     .apply();
         }
-
-        return updateFuture;
     }
 
     /**
@@ -130,7 +129,7 @@ private void deleteSharedPreferences(String userKey) {
         file.delete();
     }
 
-    synchronized ListenableFuture<Void> updateCurrentUser() {
+    ListenableFuture<Void> updateCurrentUser() {
         ListenableFuture<JsonObject> fetchFuture = fetcher.fetch(currentUser);
 
         Futures.addCallback(fetchFuture, new FutureCallback<JsonObject>() {