From 171052f12ff0e5a06d7f031b53e6535f5285bb6d Mon Sep 17 00:00:00 2001
From: Arif Burak Demiray <burakdemiray09@hotmail.com>
Date: Wed, 31 Jan 2024 10:39:28 +0300
Subject: [PATCH] feat: test changes

---
 .../ly/count/sdk/java/internal/ModuleViews.java  | 16 ++++++++++------
 .../ly/count/sdk/java/internal/ViewImpl.java     |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleViews.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleViews.java
index cf43e373..dd176c3e 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleViews.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleViews.java
@@ -107,6 +107,12 @@ public void updateGlobalViewSegmentationInternal(@Nonnull Map<String, Object> se
 
     private Map<String, Object> createViewEventSegmentation(@Nonnull ViewData vd, boolean firstView, boolean visit, Map<String, Object> customViewSegmentation) {
         Map<String, Object> viewSegmentation = new ConcurrentHashMap<>();
+        viewSegmentation.putAll(globalViewSegmentation);
+        viewSegmentation.putAll(vd.viewSegmentation);
+
+        if (customViewSegmentation != null) {
+            viewSegmentation.putAll(customViewSegmentation);
+        }
 
         viewSegmentation.put(KEY_NAME, vd.viewName);
         if (visit) {
@@ -116,12 +122,6 @@ private Map<String, Object> createViewEventSegmentation(@Nonnull ViewData vd, bo
             viewSegmentation.put(KEY_START, KEY_START_VALUE);
         }
         viewSegmentation.put(KEY_SEGMENT, internalConfig.getSdkPlatform());
-        if (customViewSegmentation != null) {
-            viewSegmentation.putAll(customViewSegmentation);
-        }
-        viewSegmentation.putAll(vd.viewSegmentation);
-        viewSegmentation.putAll(globalViewSegmentation);
-
         return viewSegmentation;
     }
 
@@ -194,6 +194,10 @@ private void autoCloseRequiredViews(boolean closeAllViews, Map<String, Object> c
         return currentViewData.viewID;
     }
 
+    protected void setFirstViewInternal(boolean firstView) {
+        this.firstView = firstView;
+    }
+
     void stopViewWithNameInternal(@Nullable String viewName, @Nullable Map<String, Object> customViewSegmentation) {
         String viewID = validateViewWithName(viewName, "stopViewWithNameInternal");
         if (viewID == null) {
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/ViewImpl.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/ViewImpl.java
index 9914ef35..be165d3c 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/ViewImpl.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/ViewImpl.java
@@ -50,6 +50,10 @@ public void stop(boolean lastView) {
         }
         stop = true;
         Countly.instance().views().stopViewWithName(name);
+        ModuleViews viewsModule = (ModuleViews) SDKCore.instance.module(CoreFeature.Views.getIndex());
+        if (viewsModule != null) {
+            viewsModule.setFirstViewInternal(lastView);
+        }
     }
 
     @Override