Merge branch 'devel' into josh/fix-sql-helpler

Author: jophde

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java

@@ -107,7 +107,7 @@ public void stop() {
         Context appContext = mock(Context.class);
         when(context.getApplicationContext()).thenReturn(appContext);
 
-        OptimizelyManager.DataFileServiceConnection dataFileServiceConnection = new OptimizelyManager.DataFileServiceConnection(optimizelyManager);
+        OptimizelyManager.DataFileServiceConnection dataFileServiceConnection = new OptimizelyManager.DataFileServiceConnection(optimizelyManager, context);
         dataFileServiceConnection.setBound(true);
         optimizelyManager.setDataFileServiceConnection(dataFileServiceConnection);
 

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -149,7 +149,7 @@ public OptimizelyClient initialize(@NonNull Context context, @NonNull String dat
         // the user can instantiate with the latest datafile
         final Intent intent = new Intent(context.getApplicationContext(), DataFileService.class);
         if (dataFileServiceConnection == null) {
-            this.dataFileServiceConnection = new DataFileServiceConnection(this);
+            this.dataFileServiceConnection = new DataFileServiceConnection(this, context);
             context.getApplicationContext().bindService(intent, dataFileServiceConnection, Context.BIND_AUTO_CREATE);
         }
 
@@ -239,7 +239,7 @@ public void initialize(@NonNull Context context, @NonNull OptimizelyStartListene
         this.optimizelyStartListener = optimizelyStartListener;
         final Intent intent = new Intent(context.getApplicationContext(), DataFileService.class);
         if (dataFileServiceConnection == null) {
-            this.dataFileServiceConnection = new DataFileServiceConnection(this);
+            this.dataFileServiceConnection = new DataFileServiceConnection(this, context);
             context.getApplicationContext().bindService(intent, dataFileServiceConnection, Context.BIND_AUTO_CREATE);
         }
     }
@@ -265,6 +265,7 @@ public void stop(@NonNull Context context) {
         }
         if (dataFileServiceConnection != null && dataFileServiceConnection.isBound()) {
             context.getApplicationContext().unbindService(dataFileServiceConnection);
+            dataFileServiceConnection = null;
         }
 
         this.optimizelyStartListener = null;
@@ -456,10 +457,12 @@ public void onActivityDestroyed(Activity activity) {
     static class DataFileServiceConnection implements ServiceConnection {
 
         @NonNull private final OptimizelyManager optimizelyManager;
+        @NonNull private final Context context;
         private boolean bound = false;
 
-        DataFileServiceConnection(@NonNull OptimizelyManager optimizelyManager) {
+        DataFileServiceConnection(@NonNull OptimizelyManager optimizelyManager, @NonNull Context context) {
             this.optimizelyManager = optimizelyManager;
+            this.context = context;
         }
 
         /**
@@ -522,6 +525,7 @@ public void onDataFileLoaded(@Nullable String dataFile) {
         @Override
         public void onServiceDisconnected(ComponentName arg0) {
             bound = false;
+            optimizelyManager.stop(context);
         }
 
         boolean isBound() {

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerDataFileServiceConnectionTest.java

@@ -49,7 +49,7 @@ public class OptimizelyManagerDataFileServiceConnectionTest {
 
     @Before
     public void setup() {
-        dataFileServiceConnection = new OptimizelyManager.DataFileServiceConnection(optimizelyManager);
+        dataFileServiceConnection = new OptimizelyManager.DataFileServiceConnection(optimizelyManager, mock(Context.class));
     }
 
     @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)