Merge pull request #431 from Countly/fix_stop_views

Fix stop views

Author: turtledreams

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## 24.7.7
+* Mitigated an issue where an automaticly closed autostopped view's duration could have increased when opening new views
 * Mitigated an issue where, on Android 35 and above, the navigation bar was overlapping with the content display.
 
 ## 24.7.6

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

@@ -150,12 +150,12 @@ Map<String, Object> CreateViewEventSegmentation(@NonNull ViewData vd, boolean fi
 
     void autoCloseRequiredViews(boolean closeAllViews, @Nullable Map<String, Object> customViewSegmentation) {
         L.d("[ModuleViews] autoCloseRequiredViews");
-        List<String> viewsToRemove = new ArrayList<>(1);
+        List<ViewData> viewsToRemove = new ArrayList<>(1);
 
         for (Map.Entry<String, ViewData> entry : viewDataMap.entrySet()) {
             ViewData vd = entry.getValue();
-            if (closeAllViews || vd.isAutoStoppedView) {
-                viewsToRemove.add(vd.viewID);
+            if (closeAllViews || (!vd.willStartAgain && vd.isAutoStoppedView)) {
+                viewsToRemove.add(vd);
             }
         }
 
@@ -164,7 +164,13 @@ void autoCloseRequiredViews(boolean closeAllViews, @Nullable Map<String, Object>
         }
 
         for (int a = 0; a < viewsToRemove.size(); a++) {
-            stopViewWithIDInternal(viewsToRemove.get(a), customViewSegmentation);
+            ViewData vd = viewsToRemove.get(a);
+            if (!vd.willStartAgain) {
+                stopViewWithIDInternal(vd.viewID, customViewSegmentation);
+            } else if (closeAllViews) {
+                //if we are closing all views, we should remove the view from the cache
+                viewDataMap.remove(vd.viewID);
+            }
         }
     }