Merge pull request #526 from Countly/refactor_refresh

Refactor refresh content zone

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,6 @@
+## XX.XX.XX
+* Improved Content refresh mechanics.
+
 ## 26.1.0
 * Extended server configuration capabilities with server-controlled listing filters:
   * Event filters (blacklist/whitelist) to control which events are recorded.

sdk/src/androidTest/java/ly/count/android/sdk/ModuleConfigurationTests.java

@@ -1258,7 +1258,6 @@ private int[] setupTest_allFeatures(JSONObject serverConfig) {
         countlyConfig.metricProviderOverride = new MockedMetricProvider();
         Countly.sharedInstance().init(countlyConfig);
         Countly.sharedInstance().moduleContent.CONTENT_START_DELAY_MS = 0; // make it zero to catch content immediate request
-        Countly.sharedInstance().moduleContent.REFRESH_CONTENT_ZONE_DELAY_MS = 0; // make it zero to catch content immediate request
         return counts;
     }
 
@@ -2346,7 +2345,6 @@ private void testJTEWithMockedWebServer(BiConsumer<RecordedRequest, MockResponse
             countlyConfig.setServerURL(serverUrl);
             Countly.sharedInstance().init(countlyConfig);
             Countly.sharedInstance().moduleContent.CONTENT_START_DELAY_MS = 0;
-            Countly.sharedInstance().moduleContent.REFRESH_CONTENT_ZONE_DELAY_MS = 0;
 
             Thread.sleep(1000);
 

sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java

@@ -113,6 +113,7 @@ public ConnectionQueue() {
                         }
                     }
                 }
+                flushInternalGlobalRequestCallbackActions();
             }
         });
     }
@@ -945,6 +946,12 @@ public void tick() {
             L.d("[ConnectionQueue] tick, Starting ConnectionProcessor");
             ensureExecutor();
             connectionProcessorFuture_ = executor_.submit(createConnectionProcessor());
+        } else if (rqEmpty) {
+            // only fire callback when queue is genuinely empty
+            InternalRequestCallback globalCallback = internalRequestCallbacks.get(GLOBAL_RC_CALLBACK);
+            if (globalCallback != null) {
+                globalCallback.onRQFinished();
+            }
         }
     }
 
@@ -1015,7 +1022,7 @@ void addRequestToQueue(final @NonNull String requestData, final boolean writeInS
      *
      * @param runnable The action to execute when the queue finishes
      */
-    void registerInternalGlobalRequestCallbackAction(Runnable runnable) {
+    public void registerInternalGlobalRequestCallbackAction(Runnable runnable) {
         internalGlobalRequestCallbackActions.add(runnable);
     }
 
@@ -1053,4 +1060,4 @@ Future<?> getConnectionProcessorFuture() {
     void setConnectionProcessorFuture(final Future<?> connectionProcessorFuture) {
         connectionProcessorFuture_ = connectionProcessorFuture;
     }
-}
+}

sdk/src/main/java/ly/count/android/sdk/ModuleContent.java

@@ -28,7 +28,6 @@ public class ModuleContent extends ModuleBase {
     private final ContentCallback globalContentCallback;
     private int waitForDelay = 0;
     int CONTENT_START_DELAY_MS = 4000; // 4 seconds
-    int REFRESH_CONTENT_ZONE_DELAY_MS = 2500; // 2.5 seconds
 
     ModuleContent(@NonNull Countly cly, @NonNull CountlyConfig config) {
         super(cly, config);
@@ -68,8 +67,8 @@ void onActivityStarted(Activity activity, int updatedActivityCount) {
             UtilsDevice.getCutout(activity);
         }
         if (isCurrentlyInContentZone
-                && activity != null
-                && !(activity instanceof TransparentActivity)) {
+            && activity != null
+            && !(activity instanceof TransparentActivity)) {
             try {
                 Intent bringToFront = new Intent(activity, TransparentActivity.class);
                 bringToFront.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -404,8 +403,12 @@ void refreshContentZoneInternal(boolean callRQFlush) {
         }
 
         if (callRQFlush) {
+            requestQueueProvider.registerInternalGlobalRequestCallbackAction(new Runnable() {
+                @Override public void run() {
+                    enterContentZoneInternal(null, 0, null);
+                }
+            });
             _cly.moduleRequestQueue.attemptToSendStoredRequestsInternal();
-            enterContentZoneInternal(null, REFRESH_CONTENT_ZONE_DELAY_MS, null);
         } else {
             enterContentZoneWithRetriesInternal();
         }
@@ -455,4 +458,4 @@ public void refreshContentZone() {
             refreshContentZoneInternal(true);
         }
     }
-}
+}

sdk/src/main/java/ly/count/android/sdk/ModuleRequestQueue.java

@@ -492,4 +492,4 @@ public void addCustomNetworkRequestHeaders(@Nullable Map<String, String> customH
             }
         }
     }
-}
+}

sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java

@@ -75,4 +75,6 @@ interface RequestQueueProvider {
     String prepareHealthCheckRequest(String preparedMetrics);
 
     String prepareFetchContents(int portraitWidth, int portraitHeight, int landscapeWidth, int landscapeHeight, String[] categories, String language, String deviceType);
+
+    void registerInternalGlobalRequestCallbackAction(Runnable runnable);
 }