fix: clean up old codes for JobScheduler and Services. (#434)

Author: jaeopt

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

@@ -16,7 +16,6 @@
 
 package com.optimizely.ab.android.sdk;
 
-import android.app.AlarmManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -29,11 +28,9 @@
 
 import com.optimizely.ab.android.datafile_handler.DatafileHandler;
 import com.optimizely.ab.android.datafile_handler.DatafileLoadedListener;
-import com.optimizely.ab.android.datafile_handler.DatafileService;
 import com.optimizely.ab.android.datafile_handler.DefaultDatafileHandler;
 import com.optimizely.ab.android.event_handler.DefaultEventHandler;
 import com.optimizely.ab.android.shared.DatafileConfig;
-import com.optimizely.ab.android.shared.ServiceScheduler;
 import com.optimizely.ab.android.user_profile.DefaultUserProfileService;
 import com.optimizely.ab.bucketing.UserProfileService;
 import com.optimizely.ab.config.DatafileProjectConfig;
@@ -104,9 +101,9 @@ public void setup() throws Exception {
         EventProcessor eventProcessor = mock(EventProcessor.class);
         optimizelyManager = OptimizelyManager.builder(testProjectId)
                 .withLogger(logger)
-                .withDatafileDownloadInterval(3600L)
+                .withDatafileDownloadInterval(3600L, TimeUnit.SECONDS)
                 .withDatafileHandler(defaultDatafileHandler)
-                .withEventDispatchInterval(3600L)
+                .withEventDispatchInterval(3600L, TimeUnit.SECONDS)
                 .withEventHandler(eventHandler)
                 .withEventProcessor(eventProcessor)
                 .build(InstrumentationRegistry.getInstrumentation().getTargetContext());
@@ -322,7 +319,7 @@ public void initializeWithNullDatafile() {
 
     @Test
     public void initializeAsyncWithNullDatafile() {
-        optimizelyManager.initialize(InstrumentationRegistry.getInstrumentation().getContext(), new OptimizelyStartListener() {
+        optimizelyManager.initialize(InstrumentationRegistry.getInstrumentation().getContext(), null, new OptimizelyStartListener() {
             @Override
             public void onStart(OptimizelyClient optimizely) {
                 assertNotNull(optimizely);
@@ -410,21 +407,12 @@ public void injectOptimizelyNullListener() {
             e.printStackTrace();
         }
         UserProfileService userProfileService = mock(UserProfileService.class);
-        ServiceScheduler serviceScheduler = mock(ServiceScheduler.class);
         ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
         ArgumentCaptor<DefaultUserProfileService.StartCallback> callbackArgumentCaptor =
                 ArgumentCaptor.forClass(DefaultUserProfileService.StartCallback.class);
         optimizelyManager.setOptimizelyStartListener(null);
 
         optimizelyManager.injectOptimizely(context, userProfileService, minDatafile);
-        AlarmManager alarmManager = (AlarmManager) context
-                .getSystemService(Context.ALARM_SERVICE);
-        ServiceScheduler.PendingIntentFactory pendingIntentFactory = new ServiceScheduler
-                .PendingIntentFactory(context);
-
-        Intent intent = new Intent(context, DatafileService.class);
-        intent.putExtra(DatafileService.EXTRA_DATAFILE_CONFIG, optimizelyManager.getDatafileConfig().toJSONString());
-        serviceScheduler.schedule(intent, optimizelyManager.getDatafileDownloadInterval() * 1000);
 
         try {
             executor.awaitTermination(5, TimeUnit.SECONDS);
@@ -433,11 +421,6 @@ public void injectOptimizelyNullListener() {
         }
 
         verify(logger).info("No listener to send Optimizely to");
-        verify(serviceScheduler).schedule(captor.capture(), eq(TimeUnit.HOURS.toMillis(1L)));
-
-        Intent intent2 = captor.getValue();
-        assertTrue(intent2.getComponent().getShortClassName().contains("DatafileService"));
-        assertEquals(optimizelyManager.getDatafileConfig().toJSONString(), intent2.getStringExtra(DatafileService.EXTRA_DATAFILE_CONFIG));
     }
 
     @Test

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

@@ -32,11 +32,11 @@
 
 import com.optimizely.ab.Optimizely;
 import com.optimizely.ab.android.datafile_handler.DatafileHandler;
+import com.optimizely.ab.android.datafile_handler.DatafileWorker;
 import com.optimizely.ab.android.datafile_handler.DatafileLoadedListener;
-import com.optimizely.ab.android.datafile_handler.DatafileService;
 import com.optimizely.ab.android.datafile_handler.DefaultDatafileHandler;
 import com.optimizely.ab.android.event_handler.DefaultEventHandler;
-import com.optimizely.ab.android.event_handler.EventIntentService;
+import com.optimizely.ab.android.event_handler.EventDispatcher;
 import com.optimizely.ab.android.shared.DatafileConfig;
 import com.optimizely.ab.android.user_profile.DefaultUserProfileService;
 import com.optimizely.ab.bucketing.UserProfileService;
@@ -425,13 +425,6 @@ void stop(@NonNull Activity activity, @NonNull OptlyActivityLifecycleCallbacks o
         activity.getApplication().unregisterActivityLifecycleCallbacks(optlyActivityLifecycleCallbacks);
     }
 
-    /**
-     * Called after the {@link DatafileService} is unbound.
-     * <p>
-     * Here we just cancel the start listener.
-     *
-     * @param context any {@link Context} instance
-     */
     public void stop(@NonNull Context context) {
         if (!isAndroidVersionSupported()) {
             return;
@@ -779,7 +772,7 @@ public Builder withErrorHandler(ErrorHandler errorHandler) {
         }
 
         /**
-         * Sets the interval which {@link DatafileService} through the {@link DatafileHandler} will attempt to update the
+         * Sets the interval which {@link DatafileWorker} will attempt to update the
          * cached datafile.  If you set this to -1, you disable background updates.  If you don't set
          * a download interval (or set to less than 0), then no background updates will be scheduled or occur.
          * The minimum interval is 15 minutes (enforced by the Android JobScheduler API. See {@link android.app.job.JobInfo})
@@ -794,7 +787,7 @@ public Builder withDatafileDownloadInterval(long interval, TimeUnit timeUnit) {
         }
 
         /**
-         * Sets the interval which {@link DatafileService} through the {@link DatafileHandler} will attempt to update the
+         * Sets the interval which {@link DatafileWorker} will attempt to update the
          * cached datafile.  If you set this to -1, you disable background updates.  If you don't set
          * a download interval (or set to less than 0), then no background updates will be scheduled or occur.
          * The minimum interval is 900 secs (15 minutes) (enforced by the Android JobScheduler API. See {@link android.app.job.JobInfo})
@@ -822,7 +815,7 @@ public Builder withEventDispatchInterval(long interval, TimeUnit timeUnit) {
         }
 
         /**
-         * Sets the interval which {@link EventIntentService} will retry event dispatch periodically.
+         * Sets the interval which {@link EventDispatcher} will retry event dispatch periodically.
          * If you don't set this value or set this to -1, periodic retries on event dispatch failures will be disabled (but still queued and retried on next event dispatch request)
          *
          * @param interval the interval
@@ -835,7 +828,7 @@ public Builder withEventDispatchRetryInterval(long interval, TimeUnit timeUnit)
         }
 
         /**
-         * Sets the interval which {@link EventIntentService} will retry event dispatch periodically.
+         * Sets the interval which {@link EventDispatcher} will retry event dispatch periodically.
          * If you don't set this value or set this to -1, periodic retries on event dispatch failures will be disabled (but still queued and retried on next event dispatch request)
          *
          * @param interval the interval in milliseconds