Merge remote-tracking branch 'origin/master'

Author: nitzanj

lib/src/androidTest/java/com/cloudinary/android/AndroidJobStrategyTest.java

@@ -13,6 +13,7 @@
 import java.io.IOException;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class AndroidJobStrategyTest extends AbstractTest {
@@ -21,9 +22,10 @@ public class AndroidJobStrategyTest extends AbstractTest {
     public void testAdapter() throws InterruptedException, IOException {
         FilePayload payload = new FilePayload(assetToFile(TEST_IMAGE).getAbsolutePath());
 
+        int tenMinutes = 10 * 60 * 1000;
         UploadRequest<FilePayload> request =
                 new UploadRequest<>(new UploadContext<>(payload, null), null)
-                        .constrain(new TimeWindow.Builder().minLatencyMillis(20).maxExecutionDelayMillis(200).build())
+                        .constrain(new TimeWindow.Builder().minLatencyMillis(20).maxExecutionDelayMillis(tenMinutes).build())
                         .policy(new UploadPolicy.Builder()
                                 .networkPolicy(UploadPolicy.NetworkType.UNMETERED)
                                 .requiresCharging(true)
@@ -35,11 +37,20 @@ public void testAdapter() throws InterruptedException, IOException {
         JobRequest adapted = AndroidJobStrategy.adapt(request);
 
         assertEquals(20, adapted.getStartMs());
-        assertEquals(200, adapted.getEndMs());
+        assertEquals(tenMinutes, adapted.getEndMs());
         assertEquals(true, adapted.requiresCharging());
         assertEquals(false, adapted.requiresDeviceIdle());
         assertEquals(100, adapted.getBackoffMs());
         assertEquals(JobRequest.BackoffPolicy.LINEAR, adapted.getBackoffPolicy());
         assertEquals(9, adapted.getExtras().get("maxErrorRetries"));
+
+        UploadRequest<FilePayload> exactRequest =
+                new UploadRequest<>(new UploadContext<>(payload, null), null)
+                        .constrain(TimeWindow.immediate());
+
+        JobRequest adaptedExact = AndroidJobStrategy.adapt(exactRequest);
+        assertTrue(adaptedExact.isExact());
+        assertEquals(adaptedExact.getStartMs(), 1);
+        assertEquals(adaptedExact.getEndMs(), 1);
     }
 }

lib/src/main/java/com/cloudinary/android/AndroidJobStrategy.java

@@ -32,15 +32,25 @@ static JobRequest adapt(UploadRequest request) {
 
         UploadPolicy policy = request.getUploadPolicy();
 
-        return new JobRequest.Builder(JOB_TAG)
-                .setExecutionWindow(request.getTimeWindow().getMinLatencyOffsetMillis(), request.getTimeWindow().getMaxExecutionDelayMillis())
-                .setRequiredNetworkType(adaptNetworkType(policy.getNetworkType()))
+        JobRequest.Builder builder = new JobRequest.Builder(JOB_TAG)
                 .setBackoffCriteria(policy.getBackoffMillis(), adaptPolicy(policy.getBackoffPolicy()))
-                .setRequiresCharging(policy.isRequiresCharging())
-                .setRequiresDeviceIdle(policy.isRequiresIdle())
-                .setExtras(extras)
-                .setRequirementsEnforced(true)
-                .build();
+                .setExtras(extras);
+
+        if (request.getTimeWindow().isImmediate()) {
+            if (request.getUploadPolicy().hasRequirements()) {
+                Logger.d(TAG, "Note: Request marked to start immediately - all requirements will be ignored.");
+            }
+
+            builder.startNow();
+        } else {
+            builder.setExecutionWindow(request.getTimeWindow().getMinLatencyOffsetMillis(), request.getTimeWindow().getMaxExecutionDelayMillis())
+                    .setRequiredNetworkType(adaptNetworkType(policy.getNetworkType()))
+                    .setRequiresCharging(policy.isRequiresCharging())
+                    .setRequiresDeviceIdle(policy.isRequiresIdle())
+                    .setRequirementsEnforced(true);
+        }
+
+        return builder.build();
     }
 
     private static JobRequest.BackoffPolicy adaptPolicy(UploadPolicy.BackoffPolicy backoffPolicy) {

lib/src/main/java/com/cloudinary/android/policy/TimeWindow.java

@@ -73,7 +73,7 @@ public boolean isImmediate() {
      */
     public static final class Builder{
         private long minLatencyOffsetMillis = 0;
-        private long maxExecutionDelayMillis = System.currentTimeMillis() + DEFAULT_TIME_WINDOW;
+        private long maxExecutionDelayMillis = DEFAULT_TIME_WINDOW;
 
         /**
          * Sets the minimum time to wait before executing a request. This is defined as offset to current time.

lib/src/main/java/com/cloudinary/android/policy/UploadPolicy.java

@@ -70,6 +70,9 @@ public long getBackoffMillis() {
         return backoffMillis;
     }
 
+    public boolean hasRequirements() {
+        return requiresCharging || requiresIdle || networkType == NetworkType.UNMETERED;
+    }
     /**
      * Get a new builder with the configuration copied from this policy.
      */

sample/src/main/java/com/cloudinary/android/sample/core/CloudinaryHelper.java

@@ -23,7 +23,7 @@ public class CloudinaryHelper {
     public static String uploadResource(Resource resource, boolean preprocess) {
         UploadRequest request = MediaManager.get().upload(Uri.parse(resource.getLocalUri()))
                 .unsigned("sample_app_preset")
-                .constrain(TimeWindow.immediate())
+                .constrain(TimeWindow.getDefault())
                 .option("resource_type", "auto")
                 .maxFileSize(100 * 1024 * 1024) // max 100mb
                 .policy(MediaManager.get().getGlobalUploadPolicy().newBuilder().maxRetries(10).build());