diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8144c3cf0..43f43bae0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,13 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="1.8">
+      <module name="countly-sdk-java.app-java" target="11" />
+      <module name="countly-sdk-java.app-java.main" target="11" />
+      <module name="countly-sdk-java.app-java.test" target="11" />
+      <module name="countly-sdk-java.app-javafx" target="11" />
+      <module name="countly-sdk-java.app-javafx.main" target="11" />
+      <module name="countly-sdk-java.app-javafx.test" target="11" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4c37d0ce5..7d4c91b5b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,13 +5,13 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app-java" />
+            <option value="$PROJECT_DIR$/app-javafx" />
             <option value="$PROJECT_DIR$/sdk-java" />
           </set>
         </option>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d7157f5a6..b9445a488 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,111 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="16">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
-          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
-          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
-          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
-          <item index="15" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="16">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
-          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
-          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
-          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
-          <item index="15" class="java.lang.String" itemvalue="org.jspecify.nullness.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="PDMPlugin">
-    <option name="customRuleSets">
-      <list>
-        <option value="D:\programming\Countly\countly-sdk-java\ruleset.xml" />
-      </list>
-    </option>
-    <option name="options">
-      <map>
-        <entry key="Statistics URL" value="" />
-        <entry key="Target JDK" value="11" />
-      </map>
-    </option>
-    <option name="skipTestSources" value="false" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Abstraction issuesJava</id>
-          </State>
-          <State>
-            <id>Android Lint</id>
-          </State>
-          <State>
-            <id>Cloning issuesJava</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Java language level migration aidsJava</id>
-          </State>
-          <State>
-            <id>Javadoc issuesJava</id>
-          </State>
-          <State>
-            <id>Naming conventionsJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="18">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="15" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
+          <item index="17" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="18">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
+          <item index="15" class="java.lang.String" itemvalue="org.jspecify.nullness.NonNull" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
+          <item index="17" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="PDMPlugin">
+    <option name="customRuleSets">
+      <list>
+        <option value="D:\programming\Countly\countly-sdk-java\ruleset.xml" />
+      </list>
+    </option>
+    <option name="options">
+      <map>
+        <entry key="Statistics URL" value="" />
+        <entry key="Target JDK" value="11" />
+      </map>
+    </option>
+    <option name="skipTestSources" value="false" />
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Abstraction issuesJava</id>
+          </State>
+          <State>
+            <id>Android Lint</id>
+          </State>
+          <State>
+            <id>Cloning issuesJava</id>
+          </State>
+          <State>
+            <id>Java</id>
+          </State>
+          <State>
+            <id>Java language level migration aidsJava</id>
+          </State>
+          <State>
+            <id>Javadoc issuesJava</id>
+          </State>
+          <State>
+            <id>Naming conventionsJava</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Android</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 635c343d1..ad4fd665f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,6 +6,9 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.iml" filepath="$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.test.iml" filepath="$PROJECT_DIR$/.idea/modules/app-java/countly-sdk-java.app-java.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.iml" filepath="$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.test.iml" filepath="$PROJECT_DIR$/.idea/modules/app-javafx/countly-sdk-java.app-javafx.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml" filepath="$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml" filepath="$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml" filepath="$PROJECT_DIR$/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml" />
diff --git a/.idea/modules/app-java/countly-sdk-java.app-java.iml b/.idea/modules/app-java/countly-sdk-java.app-java.iml
index 3146ddb06..adfeacd90 100644
--- a/.idea/modules/app-java/countly-sdk-java.app-java.iml
+++ b/.idea/modules/app-java/countly-sdk-java.app-java.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":app-java" external.linked.project.path="$MODULE_DIR$/../../../app-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app-java">
       <excludeFolder url="file://$MODULE_DIR$/../../../app-java/.gradle" />
diff --git a/.idea/modules/app-java/countly-sdk-java.app-java.main.iml b/.idea/modules/app-java/countly-sdk-java.app-java.main.iml
index 277e7c859..1dce0390c 100644
--- a/.idea/modules/app-java/countly-sdk-java.app-java.main.iml
+++ b/.idea/modules/app-java/countly-sdk-java.app-java.main.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":app-java:main" external.linked.project.path="$MODULE_DIR$/../../../app-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
     <output url="file://$MODULE_DIR$/../../../app-java/build/classes/java/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app-java/src/main">
diff --git a/.idea/modules/app-java/countly-sdk-java.app-java.test.iml b/.idea/modules/app-java/countly-sdk-java.app-java.test.iml
index 8b92dbd4f..05c052b7c 100644
--- a/.idea/modules/app-java/countly-sdk-java.app-java.test.iml
+++ b/.idea/modules/app-java/countly-sdk-java.app-java.test.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":app-java:test" external.linked.project.path="$MODULE_DIR$/../../../app-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
     <output-test url="file://$MODULE_DIR$/../../../app-java/build/classes/java/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app-java/src/test" />
diff --git a/.idea/modules/app-javafx/countly-sdk-java.app-javafx.iml b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.iml
new file mode 100644
index 000000000..8bf65008b
--- /dev/null
+++ b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app-javafx" external.linked.project.path="$MODULE_DIR$/../../../app-javafx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../app-javafx">
+      <excludeFolder url="file://$MODULE_DIR$/../../../app-javafx/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app-javafx/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/app-javafx/countly-sdk-java.app-javafx.main.iml b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.main.iml
new file mode 100644
index 000000000..8cc8f9058
--- /dev/null
+++ b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.main.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app-javafx:main" external.linked.project.path="$MODULE_DIR$/../../../app-javafx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output url="file://$MODULE_DIR$/../../../app-javafx/build/classes/java/main" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../app-javafx/src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app-javafx/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app-javafx/src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="countly-sdk-java.sdk-java.main" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.json:json:20230227" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-web:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-media:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-base:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.json:json:20250107" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/app-javafx/countly-sdk-java.app-javafx.test.iml b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.test.iml
new file mode 100644
index 000000000..b8269e278
--- /dev/null
+++ b/.idea/modules/app-javafx/countly-sdk-java.app-javafx.test.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app-javafx:test" external.linked.project.path="$MODULE_DIR$/../../../app-javafx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output-test url="file://$MODULE_DIR$/../../../app-javafx/build/classes/java/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../app-javafx/src/test" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="countly-sdk-java.app-javafx.main" />
+    <orderEntry type="module" module-name="countly-sdk-java.sdk-java.main" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.json:json:20230227" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-web:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-media:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.openjfx:javafx-base:mac-aarch64:17.0.10" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.json:json:20250107" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="countly-sdk-java.app-javafx.main" />
+</module>
\ No newline at end of file
diff --git a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml
index 3a892994f..cc291a72a 100644
--- a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml
+++ b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sdk-java" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="ly.count.sdk" external.system.module.version="24.1.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":sdk-java" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../sdk-java">
diff --git a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml
index cad257110..711ac017d 100644
--- a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml
+++ b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sdk-java:main" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="ly.count.sdk" external.system.module.type="sourceSet" external.system.module.version="24.1.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":sdk-java:main" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../../sdk-java/build/classes/java/main" />
     <exclude-output />
diff --git a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml
index 353a48789..0b72ac134 100644
--- a/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml
+++ b/.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sdk-java:test" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="ly.count.sdk" external.system.module.type="sourceSet" external.system.module.version="24.1.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":sdk-java:test" external.linked.project.path="$MODULE_DIR$/../../../sdk-java" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="countly-sdk-java" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
     <output-test url="file://$MODULE_DIR$/../../../sdk-java/build/classes/java/test" />
     <exclude-output />
@@ -11,18 +11,12 @@
     <orderEntry type="module" module-name="countly-sdk-java.sdk-java.main" />
     <orderEntry type="library" name="Gradle: org.json:json:20250107" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.powermock:powermock-module-junit4:1.7.4" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.powermock:powermock-core:1.7.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:2.8.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.powermock:powermock-module-junit4-common:1.7.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:4.11.0" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.powermock:powermock-reflect:1.7.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.javassist:javassist:3.21.0-GA" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.objenesis:objenesis:2.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: net.bytebuddy:byte-buddy:1.6.14" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: net.bytebuddy:byte-buddy-agent:1.6.14" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.objenesis:objenesis:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.12.19" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.12.19" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.objenesis:objenesis:3.3" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="countly-sdk-java.sdk-java.main" />
 </module>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2431f6cd..5df6f63c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 24.1.6
+* Fixed a bug where the request queue would stall after sending the first request, preventing subsequent persisted requests from being sent.
+
 ## 24.1.5
 * Fixed a bug where a non-JSON server response would cause a permanent networking deadlock, preventing all subsequent requests from being sent.
 * Fixed a bug where a NullPointerException in SDKCore.recover() would permanently block SDK initialization when a crash file from a previous session existed on disk.
diff --git a/app-javafx/.gitignore b/app-javafx/.gitignore
new file mode 100644
index 000000000..42cd8c5d6
--- /dev/null
+++ b/app-javafx/.gitignore
@@ -0,0 +1,27 @@
+# Gradle
+build/
+.gradle/
+
+# Java
+*.class
+*.log
+hs_err_pid*.log
+replay_pid*.log
+
+# IntelliJ IDEA
+out/
+*.iml
+.idea/
+
+# Eclipse
+bin/
+.project
+.classpath
+.settings/
+
+# VS Code
+.vscode/
+
+# OS
+.DS_Store
+Thumbs.db
diff --git a/app-javafx/README.md b/app-javafx/README.md
new file mode 100644
index 000000000..36846b33a
--- /dev/null
+++ b/app-javafx/README.md
@@ -0,0 +1,110 @@
+# Countly Java SDK · JavaFX Demo
+
+A desktop reference demo for `sdk-java` that exercises every user-facing
+module and presents Countly **feedback widgets (survey, NPS, rating)**
+inside a JavaFX `WebView`, with the same URL interception protocol the
+C++/Qt sample uses (see
+[`countly-sdk-demos/cpp_demo`](../../countly-sdk-demos/cpp_demo) and its
+`Countly_Feedback_Widget_Implementation_Guide.html`).
+
+This module lives alongside `app-java` and builds against `sdk-java` via
+a Gradle project dependency — no copied jars.
+
+## Layout
+
+```text
+app-javafx/
+├── build.gradle                    # JavaFX plugin + project(':sdk-java')
+└── src/main/
+    ├── java/ly/count/javafx/demo/
+    │   ├── Main.java               # JavaFX entry point
+    │   ├── AppContext.java         # defaults (server url, app key, storage dir)
+    │   └── ui/
+    │       ├── MainView.java
+    │       ├── LogPanel.java       # bottom log panel, captures SDK log messages too
+    │       ├── InitPane.java
+    │       ├── EventsPane.java
+    │       ├── ViewsPane.java
+    │       ├── UserProfilePane.java
+    │       ├── LocationPane.java
+    │       ├── CrashesPane.java
+    │       ├── DeviceIdPane.java
+    │       ├── RemoteConfigPane.java
+    │       ├── FeedbackWidgetsPane.java  # WebView + widget list
+    │       ├── FeedbackHttp.java         # raw /o/sdk?method=feedback fetch (captures 'wv')
+    │       ├── WidgetCard.java
+    │       └── SdkUtil.java
+    └── resources/styles/app.css
+```
+
+## Build & run
+
+> **JVM requirement:** the `org.openjfx.javafxplugin` dependency requires
+> Gradle to run on **Java 11+**. The root `settings.gradle` only adds
+> `:app-javafx` to the build when `JavaVersion.current().isJava11Compatible()`,
+> so on a Java 8 Gradle daemon this module is silently skipped and
+> `sdk-java` / `app-java` keep building as before. Point your Gradle JVM
+> at a JDK 11+ (IntelliJ → *Settings → Build, Execution, Deployment → Build
+> Tools → Gradle → Gradle JVM*) to enable it.
+
+From the `countly-sdk-java/` repo root:
+
+```bash
+./gradlew :app-javafx:run
+```
+
+or from this module:
+
+```bash
+cd app-javafx
+gradle run
+```
+
+## SDK features demonstrated
+
+| Tab | SDK surface |
+| --- | --- |
+| **Init** | `Countly.init / stop / halt`, `Config.*` toggles, session begin/update/end, consent grant/revoke |
+| **Events** | `events().recordEvent(...)` in all overloads, timed `startEvent / endEvent / cancelEvent` |
+| **Views** | `views().startView`, `startAutoStoppedView`, stop/pause/resume by name & id, global & per-view segmentation |
+| **User Profile** | predefined keys (`PredefinedUserPropertyKeys`), custom set/setOnce/setProperties, push/pushUnique/pull, increment/incrementBy/multiply, saveMax/saveMin, save, clear |
+| **Location** | `location().setLocation(country, city, gps, ip)`, `disableLocation()` |
+| **Crashes** | `crashes().addCrashBreadcrumb`, `recordHandledException`, `recordUnhandledException` (± segmentation) |
+| **Device ID** | `deviceId().getID/getType`, `changeWithMerge`, `changeWithoutMerge`, `login`, `logout` |
+| **Remote Config** | `downloadAllKeys / downloadSpecificKeys / downloadOmittingKeys`, `getValues / getValue / getAllValuesAndEnroll / getValueAndEnroll`, enroll/exit AB tests, `clearAll` |
+| **Feedback Widgets** | `feedback().getAvailableFeedbackWidgets`, `constructFeedbackWidgetUrl`, `getFeedbackWidgetData`, `reportFeedbackWidgetManually` |
+
+## Feedback widgets via WebView
+
+1. `Fetch widgets` calls `getAvailableFeedbackWidgets(...)` and — in
+   parallel — a raw HTTP `GET /o/sdk?method=feedback` via
+   `FeedbackHttp.fetchVersions()` so we can recover the widget's `wv`
+   field (the SDK's typed `CountlyFeedbackWidget` drops it). Each card
+   shows the widget type badge plus `legacy` / `v<wv>`.
+2. **Open** builds the WebView URL via `FeedbackHttp.constructWebViewUrl(...)`,
+   same formula as `cpp_demo/main.cpp`: `custom={"tc":1}` always, plus
+   `xb=1 & rw=1` when `wv` is present. Those flags are what make the
+   WebView render its own **X close button** for versioned widgets.
+3. **Inspect data** calls `getFeedbackWidgetData(widget, ...)` and shows
+   the JSON definition in a dialog (useful when you want to render a
+   custom UI instead of the web widget).
+4. **Report manually** sends a hand-crafted result via
+   `reportFeedbackWidgetManually(widget, null, result)`.
+
+### URL interception
+
+JavaFX's `WebView` does not expose a navigation-approval callback like
+Qt's `acceptNavigationRequest`. Instead we subscribe to
+`engine.locationProperty()`; when the new URL's host is
+`countly_action_event` we call `engine.getLoadWorker().cancel()` to
+abort the navigation and handle the message ourselves:
+
+| Query signal | Meaning | Action |
+| --- | --- | --- |
+| `cly_x_int=1` | external link inside a widget | open in the system browser via `Desktop.browse` |
+| `cly_widget_command=1 & close=1` | widget close button | call `reportFeedbackWidgetManually(widget, null, null)` and reset the WebView |
+| `cly_x_action_event=1 & action=link` | link action | open in the system browser |
+| `cly_x_action_event=1 & close=1` | action + close | dismiss the WebView too |
+
+`engine.setCreatePopupHandler` catches `target="_blank"` links (privacy
+policy links, etc.) and forwards them to the system browser.
diff --git a/app-javafx/build.gradle b/app-javafx/build.gradle
new file mode 100644
index 000000000..d175b4a50
--- /dev/null
+++ b/app-javafx/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.1.0'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+javafx {
+    version = '17.0.10'
+    modules = [ 'javafx.controls', 'javafx.web' ]
+}
+
+dependencies {
+    // Build directly against the SDK module so changes in sdk-java are
+    // picked up without publishing or copying a jar.
+    implementation project(':sdk-java')
+
+    // org.json is used by the demo for pretty-printing widget data; the
+    // SDK also uses it internally (and exposes JSONObject in its API).
+    implementation 'org.json:json:20230227'
+}
+
+application {
+    mainClass = 'ly.count.javafx.demo.Main'
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/AppContext.java b/app-javafx/src/main/java/ly/count/javafx/demo/AppContext.java
new file mode 100644
index 000000000..4b4eb2db7
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/AppContext.java
@@ -0,0 +1,39 @@
+package ly.count.javafx.demo;
+
+import java.io.File;
+
+public final class AppContext {
+
+    public static final String DEFAULT_SERVER_URL = "https://your.server.ly";
+    public static final String DEFAULT_APP_KEY = "YOUR_APP_KEY";
+    public static final String DEFAULT_DEVICE_ID = "JAVA_FX_DEMO_DEVICE";
+    public static final String APP_VERSION = "1.0.0";
+
+    // Must match the values the Countly Java SDK sends for the SDK-driven
+    // flows, so our raw feedback HTTP call (used to recover the wv field
+    // for URL construction) identifies the same client.
+    public static final String SDK_NAME = "java-native";
+    public static final String SDK_VERSION = "24.1.6";
+    public static final String PLATFORM = "desktop";
+
+    // Populated from the Init tab once the user initializes the SDK; the
+    // feedback-widgets pane needs these to reach the server directly for
+    // the raw /o/sdk?method=feedback call (the SDK's Config does not expose
+    // them publicly to code outside its package).
+    public static volatile String liveServerUrl = DEFAULT_SERVER_URL;
+    public static volatile String liveAppKey    = DEFAULT_APP_KEY;
+
+    public static File storageDir() {
+        File dir = new File(
+            System.getProperty("user.home")
+                + File.separator + "__COUNTLY"
+                + File.separator + "java_fx_demo"
+        );
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        return dir;
+    }
+
+    private AppContext() {}
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/Main.java b/app-javafx/src/main/java/ly/count/javafx/demo/Main.java
new file mode 100644
index 000000000..062cfb4bf
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/Main.java
@@ -0,0 +1,33 @@
+package ly.count.javafx.demo;
+
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import ly.count.javafx.demo.ui.MainView;
+import ly.count.sdk.java.Countly;
+
+public class Main extends Application {
+
+    @Override
+    public void start(Stage stage) {
+        MainView view = new MainView();
+        Scene scene = new Scene(view.getRoot(), 1280, 820);
+        scene.getStylesheets().add(
+            getClass().getResource("/styles/app.css").toExternalForm()
+        );
+        stage.setTitle("Countly Java SDK - JavaFX Demo");
+        stage.setScene(scene);
+        stage.setOnCloseRequest(e -> {
+            if (Countly.isInitialized()) {
+                Countly.instance().stop();
+            }
+            Platform.exit();
+        });
+        stage.show();
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/CrashesPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/CrashesPane.java
new file mode 100644
index 000000000..a564a93b9
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/CrashesPane.java
@@ -0,0 +1,75 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+
+public class CrashesPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField breadcrumb = new TextField("User opened settings");
+    private final TextField segKey = new TextField("screen");
+    private final TextField segVal = new TextField("settings");
+
+    private final LogPanel log;
+
+    public CrashesPane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Breadcrumb:"), breadcrumb);
+        grid.addRow(1, new Label("Segment K/V:"), segKey);
+        grid.add(segVal, 2, 1);
+
+        Button addBC = new Button("addCrashBreadcrumb");
+        addBC.setOnAction(e -> SdkUtil.run(log, "addCrashBreadcrumb",
+            () -> Countly.instance().crashes().addCrashBreadcrumb(breadcrumb.getText())));
+
+        Button handled = new Button("recordHandledException");
+        handled.setOnAction(e -> SdkUtil.run(log, "recordHandledException",
+            () -> Countly.instance().crashes().recordHandledException(new RuntimeException("Demo handled exception"))));
+
+        Button handledSeg = new Button("recordHandledException(seg)");
+        handledSeg.setOnAction(e -> SdkUtil.run(log, "recordHandledException(seg)", () -> {
+            Map<String, Object> m = new HashMap<>();
+            m.put(segKey.getText(), segVal.getText());
+            Countly.instance().crashes().recordHandledException(new IllegalStateException("Demo handled w/ seg"), m);
+        }));
+
+        Button unhandled = new Button("recordUnhandledException");
+        unhandled.setOnAction(e -> SdkUtil.run(log, "recordUnhandledException",
+            () -> Countly.instance().crashes().recordUnhandledException(new RuntimeException("Demo unhandled exception"))));
+
+        Button unhandledSeg = new Button("recordUnhandledException(seg)");
+        unhandledSeg.setOnAction(e -> SdkUtil.run(log, "recordUnhandledException(seg)", () -> {
+            Map<String, Object> m = new HashMap<>();
+            m.put(segKey.getText(), segVal.getText());
+            Countly.instance().crashes().recordUnhandledException(new OutOfMemoryError("Demo unhandled w/ seg"), m);
+        }));
+
+        FlowPane buttons = new FlowPane(8, 8, addBC, handled, handledSeg, unhandled, unhandledSeg);
+
+        root.getChildren().addAll(title("Crashes & breadcrumbs"), grid, buttons);
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/DeviceIdPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/DeviceIdPane.java
new file mode 100644
index 000000000..bbcdf4d79
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/DeviceIdPane.java
@@ -0,0 +1,91 @@
+package ly.count.javafx.demo.ui;
+
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+
+public class DeviceIdPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField newId = new TextField("user_" + System.currentTimeMillis());
+    private final TextField loginId = new TextField("authenticated_user_42");
+    private final Label currentId = new Label("(SDK not init)");
+    private final Label currentType = new Label("-");
+    private final LogPanel log;
+    private final Label statusLabel;
+
+    public DeviceIdPane(LogPanel log, Label statusLabel) {
+        this.log = log;
+        this.statusLabel = statusLabel;
+        root.setPadding(new Insets(16));
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Current device ID:"), currentId);
+        grid.addRow(1, new Label("Current ID type:"), currentType);
+        grid.addRow(2, new Label("New ID (for merge/noMerge):"), newId);
+        grid.addRow(3, new Label("Login ID:"), loginId);
+
+        Button refresh = new Button("Refresh");
+        refresh.setOnAction(e -> refresh());
+
+        Button withMerge = new Button("changeWithMerge(newId)");
+        withMerge.setOnAction(e -> SdkUtil.run(log, "changeWithMerge", () -> {
+            Countly.instance().deviceId().changeWithMerge(newId.getText());
+            refresh();
+        }));
+
+        Button withoutMerge = new Button("changeWithoutMerge(newId)");
+        withoutMerge.setOnAction(e -> SdkUtil.run(log, "changeWithoutMerge", () -> {
+            Countly.instance().deviceId().changeWithoutMerge(newId.getText());
+            refresh();
+        }));
+
+        Button login = new Button("login(id)");
+        login.setOnAction(e -> SdkUtil.run(log, "login", () -> {
+            Countly.instance().login(loginId.getText());
+            refresh();
+        }));
+
+        Button logout = new Button("logout()");
+        logout.setOnAction(e -> SdkUtil.run(log, "logout", () -> {
+            Countly.instance().logout();
+            refresh();
+        }));
+
+        FlowPane buttons = new FlowPane(8, 8, refresh, withMerge, withoutMerge, login, logout);
+
+        root.getChildren().addAll(title("Device ID"), grid, buttons);
+    }
+
+    private void refresh() {
+        if (!Countly.isInitialized()) {
+            currentId.setText("(SDK not init)");
+            currentType.setText("-");
+            return;
+        }
+        currentId.setText(Countly.instance().deviceId().getID());
+        currentType.setText(String.valueOf(Countly.instance().deviceId().getType()));
+        if (statusLabel != null) {
+            statusLabel.setText("SDK: initialized · device=" + currentId.getText());
+            statusLabel.getStyleClass().setAll("status-pill", "status-ok");
+        }
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/EventsPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/EventsPane.java
new file mode 100644
index 000000000..1fdae8ea2
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/EventsPane.java
@@ -0,0 +1,128 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+
+public class EventsPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField key = new TextField("Basic Event");
+    private final TextField count = new TextField("1");
+    private final TextField sum = new TextField("0.0");
+    private final TextField duration = new TextField("");
+    private final TextField segKey = new TextField("source");
+    private final TextField segValue = new TextField("demo");
+    private final TextField timedKey = new TextField("timed_event");
+    private final LogPanel log;
+
+    public EventsPane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Key:"),      key);
+        grid.addRow(1, new Label("Count:"),    count);
+        grid.addRow(2, new Label("Sum:"),      sum);
+        grid.addRow(3, new Label("Duration:"), duration);
+        grid.addRow(4, new Label("Segment K/V:"), segKey);
+        grid.add(segValue, 2, 4);
+
+        Button basic = new Button("recordEvent(key)");
+        basic.setOnAction(e -> SdkUtil.run(log, "recordEvent " + key.getText(),
+            () -> Countly.instance().events().recordEvent(key.getText())));
+
+        Button withCount = new Button("recordEvent(key, count)");
+        withCount.setOnAction(e -> SdkUtil.run(log, "recordEvent w/ count",
+            () -> Countly.instance().events().recordEvent(key.getText(), parseInt(count.getText(), 1))));
+
+        Button withSum = new Button("recordEvent(key, count, sum)");
+        withSum.setOnAction(e -> SdkUtil.run(log, "recordEvent w/ sum",
+            () -> Countly.instance().events().recordEvent(
+                key.getText(), parseInt(count.getText(), 1), parseDouble(sum.getText(), 0.0))));
+
+        Button withSeg = new Button("recordEvent(key, seg)");
+        withSeg.setOnAction(e -> SdkUtil.run(log, "recordEvent w/ segmentation",
+            () -> Countly.instance().events().recordEvent(key.getText(), singleSegment())));
+
+        Button fullEvent = new Button("recordEvent(key, seg, count, sum, duration)");
+        fullEvent.setOnAction(e -> SdkUtil.run(log, "recordEvent w/ seg,count,sum,duration",
+            () -> Countly.instance().events().recordEvent(
+                key.getText(),
+                singleSegment(),
+                parseInt(count.getText(), 1),
+                parseDouble(sum.getText(), 0.0),
+                parseOptionalDouble(duration.getText()))));
+
+        Button startTimed = new Button("startEvent(timedKey)");
+        startTimed.setOnAction(e -> SdkUtil.run(log, "startEvent " + timedKey.getText(),
+            () -> Countly.instance().events().startEvent(timedKey.getText())));
+
+        Button endTimed = new Button("endEvent(timedKey)");
+        endTimed.setOnAction(e -> SdkUtil.run(log, "endEvent " + timedKey.getText(),
+            () -> Countly.instance().events().endEvent(timedKey.getText())));
+
+        Button endTimedFull = new Button("endEvent(timedKey, seg, count, sum)");
+        endTimedFull.setOnAction(e -> SdkUtil.run(log, "endEvent w/ seg,count,sum",
+            () -> Countly.instance().events().endEvent(
+                timedKey.getText(), singleSegment(),
+                parseInt(count.getText(), 1),
+                parseDouble(sum.getText(), 0.0))));
+
+        Button cancelTimed = new Button("cancelEvent(timedKey)");
+        cancelTimed.setOnAction(e -> SdkUtil.run(log, "cancelEvent " + timedKey.getText(),
+            () -> Countly.instance().events().cancelEvent(timedKey.getText())));
+
+        FlowPane basicButtons = new FlowPane(8, 8, basic, withCount, withSum, withSeg, fullEvent);
+        FlowPane timedRow = new FlowPane(8, 8, new Label("Timed key:"), timedKey, startTimed, endTimed, endTimedFull, cancelTimed);
+
+        root.getChildren().addAll(
+            title("Events"),
+            grid,
+            basicButtons,
+            title("Timed events"),
+            timedRow
+        );
+    }
+
+    private Map<String, Object> singleSegment() {
+        Map<String, Object> m = new HashMap<>();
+        if (!segKey.getText().isEmpty()) {
+            m.put(segKey.getText(), segValue.getText());
+        }
+        return m;
+    }
+
+    private static int parseInt(String s, int def) {
+        try { return Integer.parseInt(s.trim()); } catch (Exception ignored) { return def; }
+    }
+
+    private static double parseDouble(String s, double def) {
+        try { return Double.parseDouble(s.trim()); } catch (Exception ignored) { return def; }
+    }
+
+    private static Double parseOptionalDouble(String s) {
+        if (s == null || s.trim().isEmpty()) return 0.0;
+        try { return Double.parseDouble(s.trim()); } catch (Exception ignored) { return 0.0; }
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackHttp.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackHttp.java
new file mode 100644
index 000000000..09d7e8ccc
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackHttp.java
@@ -0,0 +1,125 @@
+package ly.count.javafx.demo.ui;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+/**
+ * Mirrors cpp_demo's fwFetchWidgets + fwConstructWebViewUrl: raw HTTP
+ * access to the Countly feedback endpoint so we can read the widget's
+ * {@code wv} (widget version) field — the SDK's typed
+ * {@code CountlyFeedbackWidget} drops it, but the WebView close button
+ * only renders when {@code custom.xb=1 & custom.rw=1} is present on
+ * versioned widgets. See Countly_Feedback_Widget_Implementation_Guide.html.
+ */
+final class FeedbackHttp {
+
+    static final String COMM_HOST = "countly_action_event";
+
+    /** Raw feedback endpoint response, per widget. */
+    static final class RawWidget {
+        final String id;
+        final String type;
+        final String name;
+        final String wv; // "" if legacy
+        RawWidget(String id, String type, String name, String wv) {
+            this.id = id; this.type = type; this.name = name; this.wv = wv;
+        }
+    }
+
+    /** widgetId → widget version ("" if legacy / no wv). */
+    static Map<String, String> fetchVersions(
+            String serverUrl, String appKey, String deviceId,
+            String sdkName, String sdkVersion) throws Exception {
+        Map<String, String> out = new HashMap<>();
+        String url = stripTrailingSlash(serverUrl) + "/o/sdk"
+            + "?method=feedback"
+            + "&app_key="    + enc(appKey)
+            + "&device_id="  + enc(deviceId)
+            + "&sdk_version=" + enc(sdkVersion)
+            + "&sdk_name="   + enc(sdkName);
+
+        String body = httpGet(url);
+        JSONObject j = new JSONObject(body);
+        JSONArray arr = j.optJSONArray("result");
+        if (arr == null) return out;
+        for (int i = 0; i < arr.length(); i++) {
+            JSONObject w = arr.optJSONObject(i);
+            if (w == null) continue;
+            String id = w.optString("_id", "");
+            String wv = w.optString("wv", "");
+            if (!id.isEmpty()) out.put(id, wv);
+        }
+        return out;
+    }
+
+    /**
+     * Builds the widget WebView URL exactly like cpp_demo's
+     * fwConstructWebViewUrl: tc=1 always, xb=1 &amp; rw=1 when widgetVersion
+     * is present, plus app_version which the SDK's constructFeedbackWidgetUrl()
+     * omits.
+     */
+    static String constructWebViewUrl(
+            String serverUrl, String appKey, String deviceId,
+            String sdkName, String sdkVersion, String appVersion, String platform,
+            String widgetId, String widgetType, String widgetVersion) {
+
+        JSONObject custom = new JSONObject();
+        custom.put("tc", 1);
+        if (widgetVersion != null && !widgetVersion.isEmpty()) {
+            custom.put("xb", 1);
+            custom.put("rw", 1);
+        }
+
+        return stripTrailingSlash(serverUrl) + "/feedback/" + widgetType
+            + "?widget_id="   + enc(widgetId)
+            + "&device_id="   + enc(deviceId)
+            + "&app_key="     + enc(appKey)
+            + "&sdk_version=" + enc(sdkVersion)
+            + "&sdk_name="    + enc(sdkName)
+            + "&app_version=" + enc(appVersion)
+            + "&platform="    + enc(platform)
+            + "&custom="      + enc(custom.toString());
+    }
+
+    private static String httpGet(String url) throws Exception {
+        HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(15_000);
+        conn.setReadTimeout(30_000);
+        conn.setInstanceFollowRedirects(true);
+        int status = conn.getResponseCode();
+        if (status != 200) {
+            throw new RuntimeException("HTTP " + status + " for " + url);
+        }
+        StringBuilder sb = new StringBuilder();
+        try (BufferedReader br = new BufferedReader(
+                new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+            String line;
+            while ((line = br.readLine()) != null) sb.append(line);
+        }
+        return sb.toString();
+    }
+
+    private static String enc(String s) {
+        try {
+            return URLEncoder.encode(s == null ? "" : s, StandardCharsets.UTF_8.name());
+        } catch (Exception e) {
+            return s;
+        }
+    }
+
+    private static String stripTrailingSlash(String s) {
+        if (s == null || s.isEmpty()) return s;
+        return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
+    }
+
+    private FeedbackHttp() {}
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackWidgetsPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackWidgetsPane.java
new file mode 100644
index 000000000..024fdeb63
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/FeedbackWidgetsPane.java
@@ -0,0 +1,417 @@
+package ly.count.javafx.demo.ui;
+
+import java.awt.Desktop;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javafx.application.Platform;
+import javafx.concurrent.Worker;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import ly.count.javafx.demo.AppContext;
+import ly.count.sdk.java.Countly;
+import ly.count.sdk.java.internal.CountlyFeedbackWidget;
+import ly.count.sdk.java.internal.FeedbackWidgetType;
+
+/**
+ * Mirrors cpp_demo/main.cpp + Countly_Feedback_Widget_Implementation_Guide.html:
+ *
+ *   1. list: SDK's getAvailableFeedbackWidgets() + raw HTTP fetch to capture
+ *      the {@code wv} (widget version) field the SDK drops
+ *   2. URL: built manually with {@code custom={"tc":1,"xb":1,"rw":1}} on
+ *      versioned widgets so the WebView renders its own X close button
+ *   3. URL interception: comm host {@code https://countly_action_event} +
+ *      external link flag {@code cly_x_int=1}
+ */
+public class FeedbackWidgetsPane {
+
+    private final BorderPane root = new BorderPane();
+    private final VBox cardList = new VBox(8);
+    private final Label headerLabel = new Label("Widgets (0)");
+    private final Label placeholder = new Label("Select a widget to present it here");
+    private final StackPane rightStack = new StackPane();
+    private final WebView webView = new WebView();
+    private final WebEngine engine = webView.getEngine();
+    private final LogPanel log;
+
+    private CountlyFeedbackWidget activeWidget;
+    private String activeWidgetVersion = "";
+    private final List<CountlyFeedbackWidget> fetched = new ArrayList<>();
+    // widgetId → wv ("" for legacy). Populated by the raw HTTP fetch.
+    private final Map<String, String> widgetVersions = new ConcurrentHashMap<>();
+
+    public FeedbackWidgetsPane(LogPanel log) {
+        this.log = log;
+
+        // ----- left panel -----
+        Button refresh = new Button("Fetch widgets");
+        refresh.setOnAction(e -> fetchWidgets());
+
+        VBox leftBox = new VBox(10);
+        leftBox.setPadding(new Insets(10));
+        headerLabel.getStyleClass().add("section-title");
+        HBox headerRow = new HBox(8, headerLabel, refresh);
+        headerRow.setAlignment(javafx.geometry.Pos.CENTER_LEFT);
+        leftBox.getChildren().addAll(headerRow, cardList);
+
+        ScrollPane leftScroll = new ScrollPane(leftBox);
+        leftScroll.setFitToWidth(true);
+        leftScroll.setPrefViewportWidth(340);
+
+        // ----- right panel: stack that shows placeholder OR webview -----
+        placeholder.getStyleClass().add("placeholder");
+        placeholder.setMaxWidth(Double.MAX_VALUE);
+        placeholder.setMaxHeight(Double.MAX_VALUE);
+        StackPane.setAlignment(placeholder, javafx.geometry.Pos.CENTER);
+
+        rightStack.getChildren().addAll(placeholder, webView);
+        webView.setVisible(false);
+
+        // WebView setup
+        engine.setJavaScriptEnabled(true);
+        engine.setUserAgent(engine.getUserAgent() + " CountlyJavaFXDemo/1.0");
+        engine.locationProperty().addListener((obs, oldUrl, newUrl) -> interceptUrl(newUrl));
+        engine.setCreatePopupHandler(popupFeatures -> handlePopup());
+        engine.getLoadWorker().stateProperty().addListener((obs, oldS, newS) -> {
+            if (newS == Worker.State.SUCCEEDED) {
+                webView.setVisible(true);
+                placeholder.setVisible(false);
+                log.info("[Widget] Page loaded");
+            } else if (newS == Worker.State.FAILED) {
+                showPlaceholder("Page load failed");
+                log.error("[Widget] Page load failed: " + engine.getLoadWorker().getException());
+            } else if (newS == Worker.State.CANCELLED) {
+                log.info("[Widget] Page load cancelled (handled as comm URL)");
+            }
+        });
+
+        SplitPane split = new SplitPane(leftScroll, rightStack);
+        split.setOrientation(Orientation.HORIZONTAL);
+        split.setDividerPositions(0.28);
+        root.setCenter(split);
+    }
+
+    // ------------------- Widget fetch -------------------
+    private void fetchWidgets() {
+        if (!SdkUtil.requireSdk(log)) return;
+        log.info("[Widget] Fetching available feedback widgets...");
+        cardList.getChildren().clear();
+        fetched.clear();
+        widgetVersions.clear();
+        headerLabel.setText("Widgets (...)");
+
+        // 1) Raw HTTP fetch in parallel so we can populate wv per widget.
+        //    We do this on a background thread because HttpURLConnection blocks.
+        String serverUrl = AppContext.liveServerUrl;
+        String appKey = AppContext.liveAppKey;
+        String deviceId = Countly.instance().deviceId().getID();
+        new Thread(() -> {
+            try {
+                Map<String, String> versions = FeedbackHttp.fetchVersions(
+                    serverUrl, appKey, deviceId,
+                    AppContext.SDK_NAME, AppContext.SDK_VERSION);
+                widgetVersions.putAll(versions);
+                log.info("[Widget] Raw fetch captured wv for " + versions.size() + " widgets");
+                Platform.runLater(this::refreshCards);
+            } catch (Exception ex) {
+                log.warn("[Widget] Raw fetch failed (" + ex.getMessage()
+                    + "). Close button may not render for versioned widgets.");
+            }
+        }, "countly-feedback-raw").start();
+
+        // 2) SDK fetch — still the canonical list for the demo.
+        Countly.instance().feedback().getAvailableFeedbackWidgets((widgets, error) -> Platform.runLater(() -> {
+            if (error != null || widgets == null) {
+                log.error("[Widget] SDK fetch error: " + error);
+                headerLabel.setText("Widgets (error)");
+                return;
+            }
+            fetched.clear();
+            fetched.addAll(widgets);
+            log.info("[Widget] SDK returned " + widgets.size() + " widgets");
+            refreshCards();
+        }));
+    }
+
+    private void refreshCards() {
+        cardList.getChildren().clear();
+        headerLabel.setText("Widgets (" + fetched.size() + ")");
+        for (CountlyFeedbackWidget w : fetched) {
+            String wv = widgetVersions.getOrDefault(w.widgetId, "");
+            cardList.getChildren().add(new WidgetCard(w, wv,
+                widget -> openWidget(widget, wv),
+                this::inspectWidget,
+                this::openManualReportDialog));
+        }
+    }
+
+    // ------------------- WebView presentation -------------------
+    private void openWidget(CountlyFeedbackWidget widget, String widgetVersion) {
+        if (!SdkUtil.requireSdk(log)) return;
+
+        String serverUrl = AppContext.liveServerUrl;
+        String appKey = AppContext.liveAppKey;
+        String deviceId = Countly.instance().deviceId().getID();
+
+        String url = FeedbackHttp.constructWebViewUrl(
+            serverUrl, appKey, deviceId,
+            AppContext.SDK_NAME, AppContext.SDK_VERSION,
+            AppContext.APP_VERSION, AppContext.PLATFORM,
+            widget.widgetId, widget.type.name(), widgetVersion);
+
+        activeWidget = widget;
+        activeWidgetVersion = widgetVersion == null ? "" : widgetVersion;
+        log.info("[Widget] Opening " + widget.type + " \"" + widget.name
+            + "\" (wv=" + (widgetVersion.isEmpty() ? "legacy" : widgetVersion) + ")");
+        log.info("[Widget] URL: " + url);
+
+        webView.setVisible(false);
+        placeholder.setVisible(true);
+        placeholder.setText("Loading widget...");
+        engine.load(url);
+    }
+
+    private void closeActiveWidget(boolean userClosed) {
+        if (activeWidget == null) return;
+        if (userClosed) {
+            // Mark as closed / cancelled — mirrors SDK's reportFeedbackWidgetManually(widget, null, null).
+            Countly.instance().feedback().reportFeedbackWidgetManually(activeWidget, null, null);
+            log.info("[Widget] Reported close for " + activeWidget.widgetId);
+        }
+        activeWidget = null;
+        activeWidgetVersion = "";
+        engine.load("about:blank");
+        showPlaceholder("Select a widget to present it here");
+    }
+
+    private void showPlaceholder(String text) {
+        placeholder.setText(text);
+        placeholder.setVisible(true);
+        webView.setVisible(false);
+    }
+
+    // ------------------- Inspect widget data -------------------
+    private void inspectWidget(CountlyFeedbackWidget widget) {
+        if (!SdkUtil.requireSdk(log)) return;
+        log.info("[Widget] Fetching widget data for " + widget.widgetId);
+        Countly.instance().feedback().getFeedbackWidgetData(widget, (data, error) -> Platform.runLater(() -> {
+            if (error != null) {
+                log.error("[Widget] Fetch data error: " + error);
+                showJsonDialog("Widget data error", error);
+                return;
+            }
+            String pretty = data == null ? "(empty)" : data.toString(2);
+            log.info("[Widget] Data fetched (" + pretty.length() + " chars)");
+            showJsonDialog("Widget data: " + widget.name, pretty);
+        }));
+    }
+
+    private void showJsonDialog(String title, String body) {
+        Dialog<Void> dlg = new Dialog<>();
+        dlg.setTitle(title);
+        TextArea ta = new TextArea(body);
+        ta.setEditable(false);
+        ta.setWrapText(false);
+        ta.setPrefSize(720, 480);
+        dlg.getDialogPane().setContent(ta);
+        dlg.getDialogPane().getButtonTypes().add(javafx.scene.control.ButtonType.CLOSE);
+        dlg.showAndWait();
+    }
+
+    // ------------------- Manual report dialog -------------------
+    private void openManualReportDialog(CountlyFeedbackWidget widget) {
+        if (!SdkUtil.requireSdk(log)) return;
+        Dialog<Void> dlg = new Dialog<>();
+        dlg.setTitle("Report manually: " + widget.type + " / " + widget.name);
+
+        TextField ratingField = new TextField(widget.type == FeedbackWidgetType.nps ? "9" : "4");
+        TextField commentField = new TextField("Great experience");
+        TextField emailField = new TextField("user@example.com");
+        TextField customKey = new TextField("source");
+        TextField customVal = new TextField("manual-demo");
+
+        GridPane g = new GridPane();
+        g.setHgap(10);
+        g.setVgap(8);
+        g.setPadding(new Insets(10));
+        g.addRow(0, new Label("rating"), ratingField);
+        g.addRow(1, new Label("comment"), commentField);
+        g.addRow(2, new Label("email"), emailField);
+        g.addRow(3, new Label("custom key"), customKey);
+        g.addRow(4, new Label("custom value"), customVal);
+        dlg.getDialogPane().setContent(g);
+
+        javafx.scene.control.ButtonType sendBtn = new javafx.scene.control.ButtonType("Send", javafx.scene.control.ButtonBar.ButtonData.OK_DONE);
+        javafx.scene.control.ButtonType cancelBtn = new javafx.scene.control.ButtonType("Report 'closed'", javafx.scene.control.ButtonBar.ButtonData.OTHER);
+        dlg.getDialogPane().getButtonTypes().addAll(sendBtn, cancelBtn, javafx.scene.control.ButtonType.CLOSE);
+
+        dlg.setResultConverter(btn -> {
+            if (btn == sendBtn) {
+                Map<String, Object> result = new LinkedHashMap<>();
+                try {
+                    result.put("rating", Integer.parseInt(ratingField.getText().trim()));
+                } catch (NumberFormatException ex) {
+                    log.error("[Widget] Invalid rating, skipped.");
+                }
+                result.put("comment", commentField.getText());
+                result.put("email", emailField.getText());
+                if (!customKey.getText().isEmpty()) {
+                    result.put(customKey.getText(), customVal.getText());
+                }
+                Countly.instance().feedback().reportFeedbackWidgetManually(widget, null, result);
+                log.info("[Widget] Manual report sent for " + widget.widgetId + ": " + result);
+            } else if (btn == cancelBtn) {
+                Countly.instance().feedback().reportFeedbackWidgetManually(widget, null, null);
+                log.info("[Widget] Manual 'closed' report sent for " + widget.widgetId);
+            }
+            return null;
+        });
+        dlg.showAndWait();
+    }
+
+    // ------------------- URL interception -------------------
+    private void interceptUrl(String url) {
+        if (url == null || url.isEmpty()) return;
+
+        String host = safeHost(url);
+        boolean isCommHost = FeedbackHttp.COMM_HOST.equals(host);
+        boolean isExternal = queryFlagSet(url, "cly_x_int", "1");
+
+        if (!isCommHost && !isExternal) {
+            return;
+        }
+
+        // Cancel pending navigation — we handle comm URLs ourselves.
+        engine.getLoadWorker().cancel();
+
+        Map<String, String> params = parseQuery(url);
+
+        if ("1".equals(params.get("cly_x_int"))) {
+            log.info("[Widget] External link → opening in browser: " + url);
+            openInBrowser(url);
+            return;
+        }
+
+        if ("1".equals(params.get("cly_widget_command"))) {
+            if ("1".equals(params.get("close"))) {
+                log.info("[Widget] cly_widget_command close=1");
+                Platform.runLater(() -> closeActiveWidget(true));
+            } else {
+                log.info("[Widget] Widget command: " + params);
+            }
+            return;
+        }
+
+        if ("1".equals(params.get("cly_x_action_event"))) {
+            String action = params.getOrDefault("action", "");
+            if ("link".equals(action) && params.get("link") != null) {
+                log.info("[Widget] action=link → opening " + params.get("link"));
+                openInBrowser(params.get("link"));
+            } else {
+                log.info("[Widget] action event: " + params);
+            }
+            if ("1".equals(params.get("close"))) {
+                log.info("[Widget] action + close=1 → dismissing");
+                Platform.runLater(() -> closeActiveWidget(true));
+            }
+            return;
+        }
+
+        log.warn("[Widget] Unhandled comm URL: " + url);
+    }
+
+    private static String safeHost(String url) {
+        try {
+            return new URL(url).getHost();
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    private static boolean queryFlagSet(String url, String key, String expected) {
+        int q = url.indexOf('?');
+        if (q < 0) return false;
+        String query = url.substring(q + 1);
+        String needle = key + "=" + expected;
+        return query.contains(needle);
+    }
+
+    private static Map<String, String> parseQuery(String url) {
+        Map<String, String> out = new HashMap<>();
+        int q = url.indexOf('?');
+        if (q < 0) return out;
+        String query = url.substring(q + 1);
+        for (String part : query.split("&")) {
+            int eq = part.indexOf('=');
+            if (eq < 0) {
+                out.put(decode(part), "");
+            } else {
+                out.put(decode(part.substring(0, eq)), decode(part.substring(eq + 1)));
+            }
+        }
+        return out;
+    }
+
+    private static String decode(String s) {
+        try {
+            return URLDecoder.decode(s, StandardCharsets.UTF_8.name());
+        } catch (Exception e) {
+            return s;
+        }
+    }
+
+    private static void openInBrowser(String url) {
+        try {
+            if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                Desktop.getDesktop().browse(new URI(url));
+            }
+        } catch (Exception ignored) {
+            // Headless / non-desktop env: silently fall through
+        }
+    }
+
+    // JavaFX popup handler: opens target=_blank links in the system browser and
+    // returns a throwaway engine so the WebView doesn't try to render them.
+    private WebEngine handlePopup() {
+        WebEngine popup = new WebEngine();
+        popup.locationProperty().addListener((obs, oldUrl, newUrl) -> {
+            if (newUrl != null && !newUrl.isEmpty()) {
+                log.info("[Widget] Popup → system browser: " + newUrl);
+                openInBrowser(newUrl);
+            }
+        });
+        return popup;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+
+    @SuppressWarnings("unused")
+    private static List<CountlyFeedbackWidget> emptyList() {
+        return Collections.emptyList();
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/InitPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/InitPane.java
new file mode 100644
index 000000000..d46ecb6f8
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/InitPane.java
@@ -0,0 +1,359 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import ly.count.javafx.demo.AppContext;
+import ly.count.sdk.java.Config;
+import ly.count.sdk.java.Countly;
+
+public class InitPane {
+
+    private final ScrollPane scroll = new ScrollPane();
+    private final VBox root = new VBox(14);
+
+    // Core endpoint + identity
+    private final TextField serverField = new TextField();
+    private final TextField appKeyField = new TextField();
+    private final TextField customIdField = new TextField();
+    private final TextField appVersionField = new TextField();
+    private final TextField sdkPlatformField = new TextField();
+    private final TextField saltField = new TextField();
+    private final ComboBox<Config.LoggingLevel> loggingLevelBox = new ComboBox<>();
+
+    // Feature toggles (per Config.Feature)
+    private final Map<Config.Feature, CheckBox> featureBoxes = new EnumMap<>(Config.Feature.class);
+
+    // Flags
+    private final CheckBox requiresConsent = new CheckBox("Requires consent (GDPR)");
+    private final CheckBox backendMode = new CheckBox("Enable backend mode");
+    private final CheckBox autoRcTriggers = new CheckBox("Enable RC auto-download triggers");
+    private final CheckBox rcCaching = new CheckBox("Enable RC value caching");
+    private final CheckBox rcAutoEnroll = new CheckBox("Auto-enroll AB on RC download");
+    private final CheckBox forcePost = new CheckBox("Force HTTP POST");
+    private final CheckBox disableUnhandledCrash = new CheckBox("Disable unhandled crash reporting");
+    private final CheckBox disableAutoUserProps = new CheckBox("Disable auto-send user properties");
+    private final CheckBox disableLocationBox = new CheckBox("Disable location tracking");
+
+    // Numeric / tuning fields
+    private final TextField eventQueueSizeField = new TextField();
+    private final TextField sessionUpdateDelayField = new TextField();
+    private final TextField maxBreadcrumbsField = new TextField();
+    private final TextField requestQueueMaxField = new TextField();
+    private final TextField netConnectTimeoutField = new TextField();
+    private final TextField netReadTimeoutField = new TextField();
+    private final TextField netRequestCooldownField = new TextField();
+    private final TextField netImportantCooldownField = new TextField();
+
+    private final Button initButton = new Button("Initialize SDK");
+    private final Button beginButton = new Button("Begin session");
+    private final Button updateButton = new Button("Update session");
+    private final Button endButton = new Button("End session");
+    private final Button stopButton = new Button("Stop SDK");
+    private final Button haltButton = new Button("Halt (stop + clear data)");
+    private final Button grantButton = new Button("Grant consent: ALL");
+    private final Button revokeButton = new Button("Revoke consent: ALL");
+
+    private final LogPanel log;
+    private final Label statusLabel;
+
+    public InitPane(LogPanel log, Label statusLabel) {
+        this.log = log;
+        this.statusLabel = statusLabel;
+
+        serverField.setText(AppContext.DEFAULT_SERVER_URL);
+        appKeyField.setText(AppContext.DEFAULT_APP_KEY);
+        customIdField.setText(AppContext.DEFAULT_DEVICE_ID);
+        appVersionField.setText(AppContext.APP_VERSION);
+        sdkPlatformField.setText(AppContext.PLATFORM);
+
+        // SDK defaults surfaced as placeholder/initial values
+        eventQueueSizeField.setText("1"); // demo: flush events immediately
+        sessionUpdateDelayField.setPromptText("60");
+        maxBreadcrumbsField.setPromptText("100");
+        requestQueueMaxField.setPromptText("1000");
+        netConnectTimeoutField.setPromptText("30");
+        netReadTimeoutField.setPromptText("30");
+        netRequestCooldownField.setPromptText("1000");
+        netImportantCooldownField.setPromptText("5000");
+
+        loggingLevelBox.getItems().addAll(Config.LoggingLevel.values());
+        loggingLevelBox.setValue(Config.LoggingLevel.DEBUG);
+
+        for (Config.Feature f : Config.Feature.values()) {
+            CheckBox cb = new CheckBox(f.name());
+            cb.setSelected(true); // preserve previous "enable all" default
+            featureBoxes.put(f, cb);
+        }
+
+        root.setPadding(new Insets(16));
+        root.getChildren().addAll(
+            title("SDK Initialization"),
+            buildForm(),
+            new Separator(),
+            title("Features"),
+            buildFeatures(),
+            new Separator(),
+            title("Flags"),
+            buildFlags(),
+            new Separator(),
+            title("Tuning"),
+            buildTuning(),
+            new Separator(),
+            buildButtons(),
+            new Label("Storage dir: " + AppContext.storageDir().getAbsolutePath())
+        );
+
+        scroll.setContent(root);
+        scroll.setFitToWidth(true);
+
+        initButton.setOnAction(e -> initSdk());
+        beginButton.setOnAction(e -> runWithSdk(() -> { Countly.session().begin();   log.info("session().begin()"); }));
+        updateButton.setOnAction(e -> runWithSdk(() -> { Countly.session().update();  log.info("session().update()"); }));
+        endButton.setOnAction(e -> runWithSdk(() -> { Countly.session().end();     log.info("session().end()"); }));
+        stopButton.setOnAction(e -> runWithSdk(() -> { Countly.instance().stop();   log.info("Countly.stop()"); updateStatus(); }));
+        haltButton.setOnAction(e -> runWithSdk(() -> { Countly.instance().halt();   log.info("Countly.halt()"); updateStatus(); }));
+        grantButton.setOnAction(e -> runWithSdk(() -> {
+            Countly.onConsent(Config.Feature.values());
+            log.info("onConsent(ALL)");
+        }));
+        revokeButton.setOnAction(e -> runWithSdk(() -> {
+            Countly.onConsentRemoval(Config.Feature.values());
+            log.info("onConsentRemoval(ALL)");
+        }));
+    }
+
+    private GridPane buildForm() {
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Server URL:"),                   grow(serverField));
+        grid.addRow(1, new Label("App Key:"),                      grow(appKeyField));
+        grid.addRow(2, new Label("Custom device ID (optional):"),  grow(customIdField));
+        grid.addRow(3, new Label("Application version:"),          grow(appVersionField));
+        grid.addRow(4, new Label("SDK platform:"),                 grow(sdkPlatformField));
+        grid.addRow(5, new Label("Logging level:"),                loggingLevelBox);
+        grid.addRow(6, new Label("Tampering salt (optional):"),    grow(saltField));
+        return grid;
+    }
+
+    private VBox buildFeatures() {
+        HBox row = new HBox(12);
+        for (CheckBox cb : featureBoxes.values()) {
+            row.getChildren().add(cb);
+        }
+        VBox box = new VBox(4, row);
+        box.setPadding(new Insets(2, 0, 2, 0));
+        return box;
+    }
+
+    private VBox buildFlags() {
+        HBox col1 = new HBox(20, new VBox(4, requiresConsent, backendMode, forcePost));
+        VBox rcBox = new VBox(4, autoRcTriggers, rcCaching, rcAutoEnroll);
+        VBox disableBox = new VBox(4, disableUnhandledCrash, disableAutoUserProps, disableLocationBox);
+        HBox row = new HBox(30, col1, rcBox, disableBox);
+        row.setPadding(new Insets(2, 0, 0, 0));
+        return new VBox(row);
+    }
+
+    private GridPane buildTuning() {
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Event queue size to send:"),       eventQueueSizeField);
+        grid.addRow(1, new Label("Session update delay (seconds):"), sessionUpdateDelayField);
+        grid.addRow(2, new Label("Max breadcrumbs:"),                maxBreadcrumbsField);
+        grid.addRow(3, new Label("Request queue max size:"),         requestQueueMaxField);
+        grid.addRow(4, new Label("Network connect timeout (s):"),    netConnectTimeoutField);
+        grid.addRow(5, new Label("Network read timeout (s):"),       netReadTimeoutField);
+        grid.addRow(6, new Label("Network request cooldown (ms):"),  netRequestCooldownField);
+        grid.addRow(7, new Label("Important request cooldown (ms):"), netImportantCooldownField);
+        return grid;
+    }
+
+    private HBox buildButtons() {
+        HBox row1 = new HBox(8, initButton, beginButton, updateButton, endButton);
+        HBox row2 = new HBox(8, stopButton, haltButton, grantButton, revokeButton);
+        row1.setAlignment(Pos.CENTER_LEFT);
+        row2.setAlignment(Pos.CENTER_LEFT);
+        VBox wrap = new VBox(8, row1, row2);
+        return new HBox(wrap);
+    }
+
+    private void initSdk() {
+        if (Countly.isInitialized()) {
+            log.warn("SDK already initialized. Stop it before re-init.");
+            return;
+        }
+        try {
+            Config config = new Config(
+                serverField.getText().trim(),
+                appKeyField.getText().trim(),
+                AppContext.storageDir()
+            )
+                .setLoggingLevel(loggingLevelBox.getValue())
+                .setLogListener((msg, lvl) -> log.sdk("[" + lvl + "] " + msg));
+
+            Config.Feature[] selected = selectedFeatures();
+            if (selected.length > 0) {
+                config.setFeatures(selected);
+            }
+
+            String appVersion = appVersionField.getText().trim();
+            if (!appVersion.isEmpty()) {
+                config.setApplicationVersion(appVersion);
+            }
+
+            String platform = sdkPlatformField.getText().trim();
+            if (!platform.isEmpty()) {
+                config.setSdkPlatform(platform);
+            }
+
+            String salt = saltField.getText().trim();
+            if (!salt.isEmpty()) {
+                config.enableParameterTamperingProtection(salt);
+            }
+
+            String custom = customIdField.getText().trim();
+            if (!custom.isEmpty()) {
+                config.setCustomDeviceId(custom);
+            } else {
+                config.setDeviceIdStrategy(Config.DeviceIdStrategy.UUID);
+            }
+
+            if (requiresConsent.isSelected()) {
+                config.setRequiresConsent(true);
+            }
+            if (backendMode.isSelected()) {
+                config.enableBackendMode();
+            }
+            if (autoRcTriggers.isSelected()) {
+                config.enableRemoteConfigAutomaticTriggers();
+            }
+            if (rcCaching.isSelected()) {
+                config.enableRemoteConfigValueCaching();
+            }
+            if (rcAutoEnroll.isSelected()) {
+                config.enrollABOnRCDownload();
+            }
+            if (forcePost.isSelected()) {
+                config.enableForcedHTTPPost();
+            }
+            if (disableUnhandledCrash.isSelected()) {
+                config.disableUnhandledCrashReporting();
+            }
+            if (disableAutoUserProps.isSelected()) {
+                config.disableAutoSendUserProperties();
+            }
+            if (disableLocationBox.isSelected()) {
+                config.disableLocation();
+            }
+
+            applyIntField(eventQueueSizeField,     "event queue size",        config::setEventQueueSizeToSend);
+            applyIntField(sessionUpdateDelayField, "session update delay",    config::setUpdateSessionTimerDelay);
+            applyIntField(maxBreadcrumbsField,     "max breadcrumbs",         config::setMaxBreadcrumbCount);
+            applyIntField(requestQueueMaxField,    "request queue max size",  config::setRequestQueueMaxSize);
+            applyIntField(netConnectTimeoutField,  "network connect timeout", config::setNetworkConnectTimeout);
+            applyIntField(netReadTimeoutField,     "network read timeout",    config::setNetworkReadTimeout);
+            applyIntField(netRequestCooldownField, "network request cooldown", config::setNetworkRequestCooldown);
+            applyIntField(netImportantCooldownField, "important request cooldown", config::setNetworkImportantRequestCooldown);
+
+            Countly.instance().init(config);
+
+            // Cache credentials so the feedback pane can hit the server directly
+            // for the raw /o/sdk?method=feedback request (needed to recover the
+            // 'wv' field that the SDK's typed CountlyFeedbackWidget omits).
+            AppContext.liveServerUrl = serverField.getText().trim();
+            AppContext.liveAppKey = appKeyField.getText().trim();
+
+            if (requiresConsent.isSelected() && selected.length > 0) {
+                Countly.onConsent(selected);
+                log.info("Consent granted to selected features");
+            }
+
+            Countly.session().begin();
+            log.info("SDK initialized + session begun (server=" + serverField.getText() + ")");
+            log.info("Enabled features: " + Arrays.toString(selected));
+            updateStatus();
+        } catch (Exception ex) {
+            log.error("Init failed: " + ex.getMessage());
+        }
+    }
+
+    private Config.Feature[] selectedFeatures() {
+        List<Config.Feature> out = new ArrayList<>();
+        for (Map.Entry<Config.Feature, CheckBox> e : featureBoxes.entrySet()) {
+            if (e.getValue().isSelected()) {
+                out.add(e.getKey());
+            }
+        }
+        return out.toArray(new Config.Feature[0]);
+    }
+
+    private void applyIntField(TextField field, String label, java.util.function.IntConsumer setter) {
+        String raw = field.getText() == null ? "" : field.getText().trim();
+        if (raw.isEmpty()) {
+            return;
+        }
+        try {
+            setter.accept(Integer.parseInt(raw));
+        } catch (NumberFormatException ex) {
+            log.warn("Ignoring invalid " + label + " value: " + raw);
+        }
+    }
+
+    private void runWithSdk(Runnable r) {
+        if (!Countly.isInitialized()) {
+            log.warn("SDK not initialized yet.");
+            return;
+        }
+        try {
+            r.run();
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+        }
+    }
+
+    private void updateStatus() {
+        if (Countly.isInitialized()) {
+            String id = Countly.instance().deviceId() != null
+                ? Countly.instance().deviceId().getID()
+                : "?";
+            statusLabel.setText("SDK: initialized · device=" + id);
+            statusLabel.getStyleClass().setAll("status-pill", "status-ok");
+        } else {
+            statusLabel.setText("SDK: not initialized");
+            statusLabel.getStyleClass().setAll("status-pill");
+        }
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    private static TextField grow(TextField f) {
+        f.setPrefWidth(480);
+        return f;
+    }
+
+    public Parent getRoot() {
+        return scroll;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/LocationPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/LocationPane.java
new file mode 100644
index 000000000..ee95a81b3
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/LocationPane.java
@@ -0,0 +1,59 @@
+package ly.count.javafx.demo.ui;
+
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+
+public class LocationPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField country = new TextField("TR");
+    private final TextField city    = new TextField("Istanbul");
+    private final TextField gps     = new TextField("41.0082,28.9784");
+    private final TextField ip      = new TextField("");
+
+    private final LogPanel log;
+
+    public LocationPane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Country code:"), country);
+        grid.addRow(1, new Label("City:"), city);
+        grid.addRow(2, new Label("GPS (lat,lon):"), gps);
+        grid.addRow(3, new Label("IP address:"), ip);
+
+        Button set = new Button("setLocation(...)");
+        set.setOnAction(e -> SdkUtil.run(log, "setLocation",
+            () -> Countly.instance().location().setLocation(
+                country.getText(), city.getText(), gps.getText(),
+                ip.getText().isEmpty() ? null : ip.getText())));
+
+        Button disable = new Button("disableLocation()");
+        disable.setOnAction(e -> SdkUtil.run(log, "disableLocation",
+            () -> Countly.instance().location().disableLocation()));
+
+        FlowPane buttons = new FlowPane(8, 8, set, disable);
+
+        root.getChildren().addAll(title("Location"), grid, buttons);
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/LogPanel.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/LogPanel.java
new file mode 100644
index 000000000..c84550b96
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/LogPanel.java
@@ -0,0 +1,77 @@
+package ly.count.javafx.demo.ui;
+
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+
+public class LogPanel {
+
+    private static final DateTimeFormatter TIME =
+        DateTimeFormatter.ofPattern("HH:mm:ss.SSS");
+
+    private final BorderPane root = new BorderPane();
+    private final TextArea area = new TextArea();
+
+    public LogPanel() {
+        area.setEditable(false);
+        area.getStyleClass().add("log-area");
+        area.setWrapText(false);
+
+        Label header = new Label("Log");
+        header.getStyleClass().add("panel-title");
+
+        Button clear = new Button("Clear");
+        clear.setOnAction(e -> area.clear());
+
+        HBox top = new HBox(8, header, spacer(), clear);
+        top.setPadding(new Insets(6, 10, 6, 10));
+        top.getStyleClass().add("panel-header");
+
+        root.setTop(top);
+        root.setCenter(area);
+        BorderPane.setMargin(area, new Insets(0, 8, 8, 8));
+    }
+
+    public void info(String msg) {
+        append("INFO ", msg);
+    }
+
+    public void warn(String msg) {
+        append("WARN ", msg);
+    }
+
+    public void error(String msg) {
+        append("ERROR", msg);
+    }
+
+    public void sdk(String msg) {
+        append("SDK  ", msg);
+    }
+
+    private void append(String level, String msg) {
+        String line = "[" + LocalTime.now().format(TIME) + "] " + level + " | " + msg + "\n";
+        if (Platform.isFxApplicationThread()) {
+            area.appendText(line);
+        } else {
+            Platform.runLater(() -> area.appendText(line));
+        }
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+
+    private static javafx.scene.Node spacer() {
+        javafx.scene.layout.Region r = new javafx.scene.layout.Region();
+        HBox.setHgrow(r, Priority.ALWAYS);
+        return r;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/MainView.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/MainView.java
new file mode 100644
index 000000000..f0f444df8
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/MainView.java
@@ -0,0 +1,76 @@
+package ly.count.javafx.demo.ui;
+
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Label;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+
+public class MainView {
+
+    private final BorderPane root = new BorderPane();
+    private final LogPanel logPanel = new LogPanel();
+    private final Label statusLabel = new Label("SDK: not initialized");
+
+    public MainView() {
+        root.getStyleClass().add("app-root");
+
+        TabPane tabs = new TabPane();
+        tabs.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);
+
+        tabs.getTabs().addAll(
+            tab("Init",           new InitPane(logPanel, statusLabel).getRoot()),
+            tab("Events",         new EventsPane(logPanel).getRoot()),
+            tab("Views",          new ViewsPane(logPanel).getRoot()),
+            tab("User Profile",   new UserProfilePane(logPanel).getRoot()),
+            tab("Location",       new LocationPane(logPanel).getRoot()),
+            tab("Crashes",        new CrashesPane(logPanel).getRoot()),
+            tab("Device ID",      new DeviceIdPane(logPanel, statusLabel).getRoot()),
+            tab("Remote Config",  new RemoteConfigPane(logPanel).getRoot()),
+            tab("Feedback Widgets", new FeedbackWidgetsPane(logPanel).getRoot())
+        );
+
+        SplitPane split = new SplitPane();
+        split.setOrientation(javafx.geometry.Orientation.VERTICAL);
+        split.getItems().addAll(tabs, logPanel.getRoot());
+        split.setDividerPositions(0.75);
+        SplitPane.setResizableWithParent(logPanel.getRoot(), true);
+        VBox.setVgrow(split, Priority.ALWAYS);
+
+        root.setTop(buildHeader());
+        root.setCenter(split);
+
+        logPanel.info("Ready. Head to the Init tab to configure and start the SDK.");
+    }
+
+    private HBox buildHeader() {
+        Label title = new Label("Countly Java SDK · JavaFX Demo");
+        title.getStyleClass().add("app-title");
+        statusLabel.getStyleClass().add("status-pill");
+        HBox header = new HBox(12, title, spacer(), statusLabel);
+        header.setPadding(new Insets(12, 16, 12, 16));
+        header.getStyleClass().add("header-bar");
+        return header;
+    }
+
+    private static javafx.scene.Node spacer() {
+        javafx.scene.layout.Region r = new javafx.scene.layout.Region();
+        HBox.setHgrow(r, Priority.ALWAYS);
+        return r;
+    }
+
+    private static Tab tab(String name, Parent content) {
+        Tab t = new Tab(name);
+        t.setContent(content);
+        return t;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/RemoteConfigPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/RemoteConfigPane.java
new file mode 100644
index 000000000..0b1426ad1
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/RemoteConfigPane.java
@@ -0,0 +1,137 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.Map;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+import ly.count.sdk.java.internal.RCData;
+
+public class RemoteConfigPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField keyField = new TextField("welcome_message");
+    private final TextField keysField = new TextField("welcome_message,banner,enable_ab");
+    private final TextArea  output    = new TextArea();
+    private final LogPanel log;
+
+    public RemoteConfigPane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+        output.setEditable(false);
+        output.setPrefRowCount(10);
+        VBox.setVgrow(output, Priority.ALWAYS);
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("Key:"), keyField);
+        grid.addRow(1, new Label("Keys (csv):"), keysField);
+
+        Button downloadAll = new Button("downloadAllKeys");
+        downloadAll.setOnAction(e -> SdkUtil.run(log, "downloadAllKeys",
+            () -> Countly.instance().remoteConfig().downloadAllKeys(this::onDownload)));
+
+        Button downloadSpecific = new Button("downloadSpecificKeys");
+        downloadSpecific.setOnAction(e -> SdkUtil.run(log, "downloadSpecificKeys",
+            () -> Countly.instance().remoteConfig().downloadSpecificKeys(
+                split(keysField.getText()), this::onDownload)));
+
+        Button downloadOmit = new Button("downloadOmittingKeys");
+        downloadOmit.setOnAction(e -> SdkUtil.run(log, "downloadOmittingKeys",
+            () -> Countly.instance().remoteConfig().downloadOmittingKeys(
+                split(keysField.getText()), this::onDownload)));
+
+        Button getAll = new Button("getValues");
+        getAll.setOnAction(e -> SdkUtil.run(log, "getValues",
+            () -> setOutput(formatValues(Countly.instance().remoteConfig().getValues()))));
+
+        Button getAndEnroll = new Button("getAllValuesAndEnroll");
+        getAndEnroll.setOnAction(e -> SdkUtil.run(log, "getAllValuesAndEnroll",
+            () -> setOutput(formatValues(Countly.instance().remoteConfig().getAllValuesAndEnroll()))));
+
+        Button getOne = new Button("getValue(key)");
+        getOne.setOnAction(e -> SdkUtil.run(log, "getValue", () -> {
+            RCData v = Countly.instance().remoteConfig().getValue(keyField.getText());
+            setOutput(keyField.getText() + " = " + fmt(v));
+        }));
+
+        Button getOneEnroll = new Button("getValueAndEnroll(key)");
+        getOneEnroll.setOnAction(e -> SdkUtil.run(log, "getValueAndEnroll", () -> {
+            RCData v = Countly.instance().remoteConfig().getValueAndEnroll(keyField.getText());
+            setOutput(keyField.getText() + " = " + fmt(v));
+        }));
+
+        Button enrollKeys = new Button("enrollIntoABTestsForKeys");
+        enrollKeys.setOnAction(e -> SdkUtil.run(log, "enrollIntoABTestsForKeys",
+            () -> Countly.instance().remoteConfig().enrollIntoABTestsForKeys(split(keysField.getText()))));
+
+        Button exitKeys = new Button("exitABTestsForKeys");
+        exitKeys.setOnAction(e -> SdkUtil.run(log, "exitABTestsForKeys",
+            () -> Countly.instance().remoteConfig().exitABTestsForKeys(split(keysField.getText()))));
+
+        Button clearAll = new Button("clearAll");
+        clearAll.setOnAction(e -> SdkUtil.run(log, "clearAll",
+            () -> Countly.instance().remoteConfig().clearAll()));
+
+        FlowPane buttons = new FlowPane(8, 8,
+            downloadAll, downloadSpecific, downloadOmit,
+            getAll, getAndEnroll, getOne, getOneEnroll,
+            enrollKeys, exitKeys, clearAll);
+
+        root.getChildren().addAll(title("Remote Config"), grid, buttons, new Label("Values:"), output);
+    }
+
+    private void onDownload(ly.count.sdk.java.internal.RequestResult result, String error,
+                            boolean fullValueUpdate, Map<String, RCData> values) {
+        String msg = "[RC] result=" + result + ", error=" + error
+            + ", full=" + fullValueUpdate + ", count=" + (values == null ? 0 : values.size());
+        log.info(msg);
+        Platform.runLater(() -> setOutput(msg + "\n" + formatValues(values)));
+    }
+
+    private String formatValues(Map<String, RCData> values) {
+        if (values == null || values.isEmpty()) return "(no values)";
+        StringBuilder sb = new StringBuilder();
+        values.forEach((k, v) -> sb.append(k).append(" = ").append(fmt(v)).append('\n'));
+        return sb.toString();
+    }
+
+    private static String fmt(RCData v) {
+        if (v == null) return "null";
+        return String.valueOf(v.value) + " (currentUser=" + v.isCurrentUsersData + ")";
+    }
+
+    private static String[] split(String csv) {
+        if (csv == null || csv.trim().isEmpty()) return new String[0];
+        String[] parts = csv.split(",");
+        for (int i = 0; i < parts.length; i++) parts[i] = parts[i].trim();
+        return parts;
+    }
+
+    private void setOutput(String s) {
+        if (Platform.isFxApplicationThread()) {
+            output.setText(s);
+        } else {
+            Platform.runLater(() -> output.setText(s));
+        }
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/SdkUtil.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/SdkUtil.java
new file mode 100644
index 000000000..042a01c6c
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/SdkUtil.java
@@ -0,0 +1,28 @@
+package ly.count.javafx.demo.ui;
+
+import ly.count.sdk.java.Countly;
+
+final class SdkUtil {
+
+    static boolean requireSdk(LogPanel log) {
+        if (!Countly.isInitialized()) {
+            log.warn("SDK not initialized. Initialize it from the Init tab first.");
+            return false;
+        }
+        return true;
+    }
+
+    static void run(LogPanel log, String label, Runnable r) {
+        if (!requireSdk(log)) {
+            return;
+        }
+        try {
+            r.run();
+            log.info(label);
+        } catch (Exception e) {
+            log.error(label + " failed: " + e.getMessage());
+        }
+    }
+
+    private SdkUtil() {}
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/UserProfilePane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/UserProfilePane.java
new file mode 100644
index 000000000..7834b67ca
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/UserProfilePane.java
@@ -0,0 +1,162 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+import ly.count.sdk.java.PredefinedUserPropertyKeys;
+
+public class UserProfilePane {
+
+    private final VBox root = new VBox(12);
+    private final TextField name = new TextField("Jane Doe");
+    private final TextField username = new TextField("jane");
+    private final TextField email = new TextField("jane@count.ly");
+    private final TextField organization = new TextField("Countly");
+    private final TextField phone = new TextField("+1 555 0100");
+    private final TextField picturePath = new TextField("https://example.com/avatar.png");
+    private final TextField gender = new TextField("F");
+    private final TextField byear = new TextField("1990");
+
+    private final TextField customKey = new TextField("favouritePet");
+    private final TextField customValue = new TextField("cat");
+    private final TextField incKey = new TextField("logins");
+    private final TextField incBy = new TextField("5");
+    private final TextField mulKey = new TextField("score");
+    private final TextField mulVal = new TextField("1.5");
+
+    private final LogPanel log;
+
+    public UserProfilePane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+
+        GridPane predef = new GridPane();
+        predef.setHgap(10);
+        predef.setVgap(6);
+        int r = 0;
+        predef.addRow(r++, new Label("Name:"), name);
+        predef.addRow(r++, new Label("Username:"), username);
+        predef.addRow(r++, new Label("Email:"), email);
+        predef.addRow(r++, new Label("Organization:"), organization);
+        predef.addRow(r++, new Label("Phone:"), phone);
+        predef.addRow(r++, new Label("Picture URL:"), picturePath);
+        predef.addRow(r++, new Label("Gender:"), gender);
+        predef.addRow(r,   new Label("Birth year:"), byear);
+
+        Button setPredefined = new Button("Set predefined profile + save()");
+        setPredefined.setOnAction(e -> SdkUtil.run(log, "predefined profile saved", () -> {
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.NAME, name.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.USERNAME, username.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.EMAIL, email.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.ORGANIZATION, organization.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.PHONE, phone.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.PICTURE_PATH, picturePath.getText());
+            Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.GENDER, gender.getText());
+            try {
+                Countly.instance().userProfile().setProperty(PredefinedUserPropertyKeys.BIRTH_YEAR, Integer.parseInt(byear.getText()));
+            } catch (NumberFormatException ignore) { /* tolerate empty/invalid */ }
+            Countly.instance().userProfile().save();
+        }));
+
+        GridPane customGrid = new GridPane();
+        customGrid.setHgap(10);
+        customGrid.setVgap(6);
+        customGrid.addRow(0, new Label("Custom key:"), customKey, new Label("value:"), customValue);
+        customGrid.addRow(1, new Label("Increment key:"), incKey, new Label("by:"), incBy);
+        customGrid.addRow(2, new Label("Multiply key:"), mulKey, new Label("factor:"), mulVal);
+
+        Button setCustom = new Button("setProperty(key, value)");
+        setCustom.setOnAction(e -> SdkUtil.run(log, "setProperty",
+            () -> Countly.instance().userProfile().setProperty(customKey.getText(), customValue.getText())));
+
+        Button setMany = new Button("setProperties(map)");
+        setMany.setOnAction(e -> SdkUtil.run(log, "setProperties", () -> {
+            Map<String, Object> m = new HashMap<>();
+            m.put(customKey.getText(), customValue.getText());
+            Countly.instance().userProfile().setProperties(m);
+        }));
+
+        Button setOnce = new Button("setOnce(key, value)");
+        setOnce.setOnAction(e -> SdkUtil.run(log, "setOnce",
+            () -> Countly.instance().userProfile().setOnce(customKey.getText(), customValue.getText())));
+
+        Button push = new Button("push(key, value)");
+        push.setOnAction(e -> SdkUtil.run(log, "push",
+            () -> Countly.instance().userProfile().push(customKey.getText(), customValue.getText())));
+
+        Button pushUnique = new Button("pushUnique(key, value)");
+        pushUnique.setOnAction(e -> SdkUtil.run(log, "pushUnique",
+            () -> Countly.instance().userProfile().pushUnique(customKey.getText(), customValue.getText())));
+
+        Button pull = new Button("pull(key, value)");
+        pull.setOnAction(e -> SdkUtil.run(log, "pull",
+            () -> Countly.instance().userProfile().pull(customKey.getText(), customValue.getText())));
+
+        Button inc = new Button("increment(key)");
+        inc.setOnAction(e -> SdkUtil.run(log, "increment",
+            () -> Countly.instance().userProfile().increment(incKey.getText())));
+
+        Button incByBtn = new Button("incrementBy(key, n)");
+        incByBtn.setOnAction(e -> SdkUtil.run(log, "incrementBy",
+            () -> Countly.instance().userProfile().incrementBy(incKey.getText(), parseInt(incBy.getText()))));
+
+        Button mul = new Button("multiply(key, factor)");
+        mul.setOnAction(e -> SdkUtil.run(log, "multiply",
+            () -> Countly.instance().userProfile().multiply(mulKey.getText(), parseDouble(mulVal.getText()))));
+
+        Button saveMax = new Button("saveMax(key, value)");
+        saveMax.setOnAction(e -> SdkUtil.run(log, "saveMax",
+            () -> Countly.instance().userProfile().saveMax(mulKey.getText(), parseDouble(mulVal.getText()))));
+
+        Button saveMin = new Button("saveMin(key, value)");
+        saveMin.setOnAction(e -> SdkUtil.run(log, "saveMin",
+            () -> Countly.instance().userProfile().saveMin(mulKey.getText(), parseDouble(mulVal.getText()))));
+
+        Button save = new Button("save()");
+        save.setOnAction(e -> SdkUtil.run(log, "save",
+            () -> Countly.instance().userProfile().save()));
+
+        Button clear = new Button("clear()");
+        clear.setOnAction(e -> SdkUtil.run(log, "clear",
+            () -> Countly.instance().userProfile().clear()));
+
+        FlowPane buttons = new FlowPane(8, 8,
+            setCustom, setMany, setOnce, push, pushUnique, pull,
+            inc, incByBtn, mul, saveMax, saveMin, save, clear);
+
+        root.getChildren().addAll(
+            title("Predefined user properties"),
+            predef,
+            setPredefined,
+            title("Custom properties"),
+            customGrid,
+            buttons
+        );
+    }
+
+    private static int parseInt(String s) {
+        try { return Integer.parseInt(s.trim()); } catch (Exception e) { return 1; }
+    }
+
+    private static double parseDouble(String s) {
+        try { return Double.parseDouble(s.trim()); } catch (Exception e) { return 1.0; }
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/ViewsPane.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/ViewsPane.java
new file mode 100644
index 000000000..87a0cc171
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/ViewsPane.java
@@ -0,0 +1,116 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+import javafx.geometry.Insets;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.Countly;
+
+public class ViewsPane {
+
+    private final VBox root = new VBox(12);
+    private final TextField viewName = new TextField("home");
+    private final TextField viewId = new TextField();
+    private final TextField segKey = new TextField("section");
+    private final TextField segVal = new TextField("top");
+    private final LogPanel log;
+
+    public ViewsPane(LogPanel log) {
+        this.log = log;
+        root.setPadding(new Insets(16));
+
+        GridPane grid = new GridPane();
+        grid.setHgap(10);
+        grid.setVgap(8);
+        grid.addRow(0, new Label("View name:"), viewName);
+        grid.addRow(1, new Label("View ID:"), viewId);
+        grid.addRow(2, new Label("Segment K/V:"), segKey);
+        grid.add(segVal, 2, 2);
+
+        Button startView = new Button("startView(name)");
+        startView.setOnAction(e -> SdkUtil.run(log, "startView " + viewName.getText(), () -> {
+            String id = Countly.instance().views().startView(viewName.getText());
+            viewId.setText(id == null ? "" : id);
+        }));
+
+        Button startAuto = new Button("startAutoStoppedView(name)");
+        startAuto.setOnAction(e -> SdkUtil.run(log, "startAutoStoppedView " + viewName.getText(), () -> {
+            String id = Countly.instance().views().startAutoStoppedView(viewName.getText());
+            viewId.setText(id == null ? "" : id);
+        }));
+
+        Button startSeg = new Button("startView(name, seg)");
+        startSeg.setOnAction(e -> SdkUtil.run(log, "startView w/ seg", () -> {
+            String id = Countly.instance().views().startView(viewName.getText(), seg());
+            viewId.setText(id == null ? "" : id);
+        }));
+
+        Button stopName = new Button("stopViewWithName(name)");
+        stopName.setOnAction(e -> SdkUtil.run(log, "stopViewWithName " + viewName.getText(),
+            () -> Countly.instance().views().stopViewWithName(viewName.getText())));
+
+        Button stopNameSeg = new Button("stopViewWithName(name, seg)");
+        stopNameSeg.setOnAction(e -> SdkUtil.run(log, "stopViewWithName w/ seg",
+            () -> Countly.instance().views().stopViewWithName(viewName.getText(), seg())));
+
+        Button stopId = new Button("stopViewWithID(id)");
+        stopId.setOnAction(e -> SdkUtil.run(log, "stopViewWithID " + viewId.getText(),
+            () -> Countly.instance().views().stopViewWithID(viewId.getText())));
+
+        Button pauseId = new Button("pauseViewWithID(id)");
+        pauseId.setOnAction(e -> SdkUtil.run(log, "pauseViewWithID " + viewId.getText(),
+            () -> Countly.instance().views().pauseViewWithID(viewId.getText())));
+
+        Button resumeId = new Button("resumeViewWithID(id)");
+        resumeId.setOnAction(e -> SdkUtil.run(log, "resumeViewWithID " + viewId.getText(),
+            () -> Countly.instance().views().resumeViewWithID(viewId.getText())));
+
+        Button stopAll = new Button("stopAllViews(seg)");
+        stopAll.setOnAction(e -> SdkUtil.run(log, "stopAllViews",
+            () -> Countly.instance().views().stopAllViews(seg())));
+
+        Button addSegName = new Button("addSegmentationToViewWithName");
+        addSegName.setOnAction(e -> SdkUtil.run(log, "addSegmentationToViewWithName",
+            () -> Countly.instance().views().addSegmentationToViewWithName(viewName.getText(), seg())));
+
+        Button addSegId = new Button("addSegmentationToViewWithID");
+        addSegId.setOnAction(e -> SdkUtil.run(log, "addSegmentationToViewWithID",
+            () -> Countly.instance().views().addSegmentationToViewWithID(viewId.getText(), seg())));
+
+        Button setGlobal = new Button("setGlobalViewSegmentation");
+        setGlobal.setOnAction(e -> SdkUtil.run(log, "setGlobalViewSegmentation",
+            () -> Countly.instance().views().setGlobalViewSegmentation(seg())));
+
+        Button updateGlobal = new Button("updateGlobalViewSegmentation");
+        updateGlobal.setOnAction(e -> SdkUtil.run(log, "updateGlobalViewSegmentation",
+            () -> Countly.instance().views().updateGlobalViewSegmentation(seg())));
+
+        FlowPane buttons = new FlowPane(8, 8,
+            startView, startAuto, startSeg, stopName, stopNameSeg, stopId, pauseId, resumeId, stopAll,
+            addSegName, addSegId, setGlobal, updateGlobal);
+
+        root.getChildren().addAll(title("Views"), grid, buttons);
+    }
+
+    private Map<String, Object> seg() {
+        Map<String, Object> m = new HashMap<>();
+        if (!segKey.getText().isEmpty()) m.put(segKey.getText(), segVal.getText());
+        return m;
+    }
+
+    private static Label title(String s) {
+        Label l = new Label(s);
+        l.getStyleClass().add("section-title");
+        return l;
+    }
+
+    public Parent getRoot() {
+        return root;
+    }
+}
diff --git a/app-javafx/src/main/java/ly/count/javafx/demo/ui/WidgetCard.java b/app-javafx/src/main/java/ly/count/javafx/demo/ui/WidgetCard.java
new file mode 100644
index 000000000..aefa0bbff
--- /dev/null
+++ b/app-javafx/src/main/java/ly/count/javafx/demo/ui/WidgetCard.java
@@ -0,0 +1,76 @@
+package ly.count.javafx.demo.ui;
+
+import java.util.Arrays;
+import java.util.function.Consumer;
+import javafx.geometry.Insets;
+import javafx.scene.Cursor;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import ly.count.sdk.java.internal.CountlyFeedbackWidget;
+import ly.count.sdk.java.internal.FeedbackWidgetType;
+
+public class WidgetCard extends VBox {
+
+    public WidgetCard(CountlyFeedbackWidget widget,
+                      String widgetVersion,
+                      Consumer<CountlyFeedbackWidget> onOpen,
+                      Consumer<CountlyFeedbackWidget> onInspect,
+                      Consumer<CountlyFeedbackWidget> onManualReport) {
+        getStyleClass().add("widget-card");
+        setPadding(new Insets(10));
+        setSpacing(4);
+        setCursor(Cursor.HAND);
+
+        Label badge = new Label(widget.type.name().toUpperCase());
+        badge.getStyleClass().addAll("badge", typeClass(widget.type));
+
+        Label versionBadge = new Label(
+            widgetVersion == null || widgetVersion.isEmpty()
+                ? "legacy"
+                : "v" + widgetVersion);
+        versionBadge.getStyleClass().addAll("badge", "badge-version");
+
+        HBox badgeRow = new HBox(6, badge, versionBadge);
+
+        String name = widget.name == null || widget.name.isEmpty() ? "(unnamed)" : widget.name;
+        Label nameLabel = new Label(name);
+        nameLabel.getStyleClass().add("widget-name");
+        nameLabel.setWrapText(true);
+
+        String id = widget.widgetId == null ? "" : widget.widgetId;
+        Label idLabel = new Label("ID: " + (id.length() > 14 ? id.substring(0, 14) + "..." : id));
+        idLabel.getStyleClass().add("widget-sub");
+
+        Label tagsLabel = new Label("Tags: " +
+            (widget.tags == null || widget.tags.length == 0 ? "—" : Arrays.toString(widget.tags)));
+        tagsLabel.getStyleClass().add("widget-sub");
+
+        javafx.scene.control.Button open = new javafx.scene.control.Button("Open");
+        open.setOnAction(e -> onOpen.accept(widget));
+        javafx.scene.control.Button inspect = new javafx.scene.control.Button("Inspect data");
+        inspect.setOnAction(e -> onInspect.accept(widget));
+        javafx.scene.control.Button manual = new javafx.scene.control.Button("Report manually");
+        manual.setOnAction(e -> onManualReport.accept(widget));
+
+        HBox actions = new HBox(6, open, inspect, manual);
+        actions.setPadding(new Insets(6, 0, 0, 0));
+
+        getChildren().addAll(badgeRow, nameLabel, idLabel, tagsLabel, actions);
+
+        setOnMouseClicked(e -> {
+            if (e.getTarget() == this || e.getTarget() instanceof Label) {
+                onOpen.accept(widget);
+            }
+        });
+    }
+
+    private static String typeClass(FeedbackWidgetType type) {
+        switch (type) {
+            case nps:    return "badge-nps";
+            case survey: return "badge-survey";
+            case rating: return "badge-rating";
+            default:     return "badge-other";
+        }
+    }
+}
diff --git a/app-javafx/src/main/resources/styles/app.css b/app-javafx/src/main/resources/styles/app.css
new file mode 100644
index 000000000..36f3678f4
--- /dev/null
+++ b/app-javafx/src/main/resources/styles/app.css
@@ -0,0 +1,94 @@
+.app-root {
+    -fx-font-family: "Segoe UI", "Helvetica Neue", Arial, sans-serif;
+    -fx-font-size: 13px;
+    -fx-background-color: #f5f6f8;
+}
+
+.header-bar {
+    -fx-background-color: #1f2430;
+}
+.app-title {
+    -fx-text-fill: #ffffff;
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+}
+.status-pill {
+    -fx-background-color: #444a57;
+    -fx-text-fill: #eaeaea;
+    -fx-background-radius: 12;
+    -fx-padding: 4 10 4 10;
+    -fx-font-size: 12px;
+}
+.status-ok {
+    -fx-background-color: #2ecc71;
+    -fx-text-fill: white;
+}
+
+.section-title {
+    -fx-font-size: 15px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #2a2f3a;
+    -fx-padding: 4 0 4 0;
+}
+
+.panel-header {
+    -fx-background-color: #eaecf1;
+    -fx-border-color: transparent transparent #d3d7de transparent;
+}
+.panel-title {
+    -fx-font-weight: bold;
+    -fx-text-fill: #2a2f3a;
+}
+
+.log-area {
+    -fx-font-family: "SFMono-Regular", Menlo, Consolas, monospace;
+    -fx-font-size: 12px;
+    -fx-control-inner-background: #0f1115;
+    -fx-background-color: #0f1115;
+    -fx-text-fill: white;
+    -fx-highlight-fill: #264f78;
+    -fx-highlight-text-fill: white;
+}
+.log-area .content { -fx-background-color: #0f1115; }
+.log-area .text    { -fx-fill: white; }
+.log-area:focused  { -fx-faint-focus-color: transparent; -fx-focus-color: transparent; }
+
+.widget-card {
+    -fx-background-color: #ffffff;
+    -fx-border-color: #d3d7de;
+    -fx-border-radius: 8;
+    -fx-background-radius: 8;
+}
+.widget-card:hover {
+    -fx-border-color: #4a90d9;
+    -fx-background-color: #f0f7ff;
+}
+
+.widget-name {
+    -fx-font-weight: bold;
+    -fx-font-size: 14px;
+}
+.widget-sub {
+    -fx-font-size: 11px;
+    -fx-text-fill: #8a909b;
+}
+
+.badge {
+    -fx-text-fill: white;
+    -fx-background-radius: 4;
+    -fx-padding: 2 8 2 8;
+    -fx-font-size: 11px;
+    -fx-font-weight: bold;
+}
+.badge-nps     { -fx-background-color: #e67e22; }
+.badge-survey  { -fx-background-color: #2ecc71; }
+.badge-rating  { -fx-background-color: #3498db; }
+.badge-other   { -fx-background-color: #888;    }
+.badge-version { -fx-background-color: #6c7a89; }
+
+.placeholder {
+    -fx-font-size: 15px;
+    -fx-text-fill: #8a909b;
+    -fx-background-color: #fafbfd;
+    -fx-alignment: center;
+}
diff --git a/build.gradle b/build.gradle
index 2c3b316d6..e18483f6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 allprojects {
-  ext.CLY_VERSION = "24.1.5"
+  ext.CLY_VERSION = "24.1.6"
   ext.POWERMOCK_VERSION = "1.7.4"
 
   tasks.withType(Javadoc) {
diff --git a/gradle.properties b/gradle.properties
index 77c0d779e..514bec16c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@
 # org.gradle.parallel=true
 
 # RELEASE FIELD SECTION
-VERSION_NAME=24.1.5
+VERSION_NAME=24.1.6
 GROUP=ly.count.sdk
 
 POM_URL=https://github.com/Countly/countly-sdk-java
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/Config.java b/sdk-java/src/main/java/ly/count/sdk/java/Config.java
index cf5df62fd..11a83338d 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/Config.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/Config.java
@@ -68,7 +68,7 @@ public class Config {
     /**
      * Countly SDK version to be sent in HTTP requests
      */
-    protected String sdkVersion = "24.1.5";
+    protected String sdkVersion = "24.1.6";
 
     /**
      * Countly SDK version to be sent in HTTP requests
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/Tasks.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/Tasks.java
index 6eb7cb8c6..0f279c4d7 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/Tasks.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/Tasks.java
@@ -92,12 +92,9 @@ <T> Future<T> run(final Task<T> task, final Callback<T> callback) {
                 @Override
                 public T call() throws Exception {
                     running = task.id;
+                    T result;
                     try {
-                        T result = task.call();
-                        if (callback != null) {
-                            callback.call(result);
-                        }
-                        return result;
+                        result = task.call();
                     } finally {
                         synchronized (pending) {
                             if (!task.id.equals(0L)) {
@@ -106,6 +103,10 @@ public T call() throws Exception {
                             running = null;
                         }
                     }
+                    if (callback != null) {
+                        callback.call(result);
+                    }
+                    return result;
                 }
             });
 
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/ScenarioRequestQueueStallTests.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/ScenarioRequestQueueStallTests.java
new file mode 100644
index 000000000..5f4c46f44
--- /dev/null
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/ScenarioRequestQueueStallTests.java
@@ -0,0 +1,136 @@
+package ly.count.sdk.java.internal;
+
+import com.sun.net.httpserver.HttpServer;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import ly.count.sdk.java.Config;
+import ly.count.sdk.java.Countly;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * End-to-end reproducer for GitHub issue #271:
+ * "Request queue stalls after the first request in SDK 24.1.5".
+ *
+ * The race the user hit in production: while request #1 is in-flight, the SDK
+ * queues additional requests to disk. When #1 completes, its callback inside
+ * Tasks.java re-enters DefaultNetworking.check() — which short-circuits if
+ * tasks.isRunning() returns true. In 24.1.5 the callback fired before
+ * `running` was cleared, so check() saw isRunning()=true and skipped
+ * scheduling the next request. The queue silently stopped draining.
+ *
+ * To reproduce deterministically we hold request #1 open with a CountDownLatch
+ * while we generate a backlog, then release it and assert the backlog drains
+ * without any external trigger.
+ */
+@RunWith(JUnit4.class)
+public class ScenarioRequestQueueStallTests {
+
+    private HttpServer server;
+    private int port;
+
+    @Before
+    public void setUp() {
+        TestUtils.createCleanTestState();
+    }
+
+    @After
+    public void tearDown() {
+        Countly.instance().halt();
+        if (server != null) {
+            server.stop(0);
+        }
+    }
+
+    private Config configForLocalServer() {
+        return new Config("http://localhost:" + port, TestUtils.SERVER_APP_KEY, TestUtils.getTestSDirectory())
+            .setLoggingLevel(Config.LoggingLevel.VERBOSE)
+            .setDeviceIdStrategy(Config.DeviceIdStrategy.UUID)
+            .enableFeatures(Config.Feature.Events, Config.Feature.Sessions)
+            .setEventQueueSizeToSend(1);
+    }
+
+    /**
+     * Reproduces the user-reported symptom: with multiple requests piled up
+     * on disk while the network is busy, the queue must drain without
+     * external prompting once the network is free again.
+     *
+     * Buggy 24.1.5 Tasks.java: only request #1 reaches the server.
+     * Fixed: all queued requests reach the server.
+     */
+    @Test
+    public void backloggedRequests_drainAfterInFlightCompletes() throws Exception {
+        AtomicInteger requestCount = new AtomicInteger(0);
+        CountDownLatch firstRequestArrived = new CountDownLatch(1);
+        CountDownLatch releaseFirstRequest = new CountDownLatch(1);
+
+        server = HttpServer.create(new InetSocketAddress(0), 0);
+        port = server.getAddress().getPort();
+        server.createContext("/", exchange -> {
+            int n = requestCount.incrementAndGet();
+            if (n == 1) {
+                // Hold request #1 open until the test has built up a backlog.
+                firstRequestArrived.countDown();
+                try {
+                    releaseFirstRequest.await(10, TimeUnit.SECONDS);
+                } catch (InterruptedException ignored) {
+                }
+            }
+            String body = "{\"result\":\"Success\"}";
+            exchange.sendResponseHeaders(200, body.length());
+            OutputStream os = exchange.getResponseBody();
+            os.write(body.getBytes());
+            os.close();
+        });
+        server.start();
+
+        Countly.instance().init(configForLocalServer());
+        Countly.session().begin();
+
+        // Wait until request #1 has reached the server and is being held.
+        Assert.assertTrue(
+            "request #1 should reach the server within 5s",
+            firstRequestArrived.await(5, TimeUnit.SECONDS)
+        );
+
+        // Build up a backlog: each recordEvent flushes a new request to disk.
+        // While the server holds #1, all of these queue up because
+        // DefaultNetworking.check() short-circuits on isRunning() == true.
+        final int backlogSize = 5;
+        for (int i = 0; i < backlogSize; i++) {
+            Countly.instance().events().recordEvent("backlog_evt_" + i);
+        }
+
+        // Give the event flushes time to actually write request files to disk.
+        Thread.sleep(500);
+
+        // Release #1. From this point on no external code calls check() —
+        // the queue must self-drain via the callback re-entry path that
+        // issue #271 broke.
+        releaseFirstRequest.countDown();
+
+        // Poll for drain. Total expected = 1 (begin_session) + backlogSize.
+        // Use >= because device-id resolution or merge requests may add extras;
+        // the regression is "queue stops at 1", so any number > 1 + a generous
+        // wait is the meaningful signal.
+        int expectedMinimum = 1 + backlogSize;
+        long deadline = System.currentTimeMillis() + 10_000;
+        while (System.currentTimeMillis() < deadline && requestCount.get() < expectedMinimum) {
+            Thread.sleep(100);
+        }
+
+        Assert.assertTrue(
+            "request queue should drain to >= " + expectedMinimum + " requests "
+                + "without external check() calls — got " + requestCount.get()
+                + " (queue stalled if << expected)",
+            requestCount.get() >= expectedMinimum
+        );
+    }
+}
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksExceptionRecoveryTests.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksExceptionRecoveryTests.java
index af67ec052..b94e15f6f 100644
--- a/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksExceptionRecoveryTests.java
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksExceptionRecoveryTests.java
@@ -1,6 +1,8 @@
 package ly.count.sdk.java.internal;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -131,10 +133,19 @@ public Boolean call() {
         Assert.assertFalse("Executor should not be running", tasks.isRunning());
     }
 
+    private static Object getField(Object target, String fieldName) throws Exception {
+        Field field = target.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(target);
+    }
+
     /**
      * When a callback throws an exception, the executor should still recover
-     * and not deadlock. The callback runs inside the try block, so its exception
-     * is caught by the finally block.
+     * and not deadlock. After the issue #271 fix the callback runs outside the
+     * try/finally, so `running = null` has already executed before the throw —
+     * the exception propagates into the Future without leaving the executor
+     * stuck. This test uses id=0L; for the `pending.remove` branch on a
+     * non-zero-id task see callbackExceptionDoesNotLeakPendingForIdTask.
      */
     @Test
     public void callbackException_executorRecovers() throws Exception {
@@ -287,4 +298,101 @@ public Boolean call() throws Exception {
             tasks.isRunning()
         );
     }
+
+    /**
+     * After a task with a non-zero id throws, the `pending` map must be empty.
+     * Locks the cleanup contract directly rather than inferring it from dedup
+     * behavior — guards against future refactors that move pending.remove()
+     * out of the finally block.
+     */
+    @Test
+    public void pendingIsEmptyAfterIdTaskThrows() throws Exception {
+        Long taskId = 42L;
+
+        tasks.run(new Tasks.Task<Boolean>(taskId) {
+            @Override
+            public Boolean call() {
+                throw new RuntimeException("Simulated failure");
+            }
+        });
+
+        tasks.await();
+
+        Map<?, ?> pending = (Map<?, ?>) getField(tasks, "pending");
+        synchronized (pending) {
+            Assert.assertTrue("pending map should be empty after task throws", pending.isEmpty());
+        }
+    }
+
+    /**
+     * Issue #271 + #264 interaction: when a callback throws on a task with a
+     * non-zero id, both `running` and `pending` must be cleared. The existing
+     * callbackException_executorRecovers test uses id=0L, so it never exercises
+     * the `pending.remove(task.id)` branch — this test does.
+     */
+    @Test
+    public void callbackExceptionDoesNotLeakPendingForIdTask() throws Exception {
+        Long taskId = 99L;
+
+        tasks.run(new Tasks.Task<Boolean>(taskId) {
+            @Override
+            public Boolean call() {
+                return true;
+            }
+        }, result -> {
+            throw new RuntimeException("Simulated callback failure");
+        });
+
+        tasks.await();
+
+        Assert.assertFalse("running should be cleared after callback throws", tasks.isRunning());
+        Map<?, ?> pending = (Map<?, ?>) getField(tasks, "pending");
+        synchronized (pending) {
+            Assert.assertTrue("pending should be empty after callback throws on id-task", pending.isEmpty());
+        }
+    }
+
+    /**
+     * Issue #271 + #264 recovery path: after a callback throws (e.g. transient
+     * parse error in DefaultNetworking.check), a subsequent task's callback
+     * must still be able to re-enter the scheduler and queue the next request.
+     * This is the production scenario — taking down the request queue requires
+     * BOTH "callback A throws" AND "callback B can no longer reschedule".
+     */
+    @Test
+    public void callbackThrows_subsequentCallbackCanReschedule() throws Exception {
+        // Task A: succeeds, callback throws.
+        tasks.run(new Tasks.Task<Boolean>(0L) {
+            @Override
+            public Boolean call() {
+                return true;
+            }
+        }, result -> {
+            throw new RuntimeException("Simulated callback A failure");
+        });
+        tasks.await();
+
+        // Task B: succeeds, callback re-enters scheduler to run task C
+        // (mirrors DefaultNetworking.check() recovering after a failed callback).
+        CountDownLatch taskCRan = new CountDownLatch(1);
+        tasks.run(new Tasks.Task<Boolean>(0L) {
+            @Override
+            public Boolean call() {
+                return true;
+            }
+        }, paramB -> {
+            if (!tasks.isRunning()) {
+                tasks.run(new Tasks.Task<Boolean>(0L) {
+                    @Override
+                    public Boolean call() {
+                        taskCRan.countDown();
+                        return true;
+                    }
+                });
+            }
+        });
+
+        Assert.assertTrue("task C should run — recovery path after a failed callback must still allow re-entry",
+            taskCRan.await(2, TimeUnit.SECONDS));
+    }
 }
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksTests.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksTests.java
index 6cbf88257..8d13f53d9 100644
--- a/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksTests.java
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/TasksTests.java
@@ -1,8 +1,10 @@
 package ly.count.sdk.java.internal;
 
 import java.lang.reflect.Field;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -76,6 +78,65 @@ public Object call() {
         Assert.assertEquals(Boolean.TRUE, called[1]);
     }
 
+    /**
+     * Regression for issue #271, end-to-end: mirrors the
+     * DefaultNetworking.check() pattern where task A's callback re-enters the
+     * scheduler with `if (!isRunning()) tasks.run(taskB)`. The actual user-facing
+     * failure was not "isRunning() reports the wrong value" but "the next request
+     * never runs". This test proves task B is both scheduled AND executed.
+     */
+    @Test
+    public void testCallbackCanScheduleAndRunNextTask() throws Exception {
+        final CountDownLatch taskBRan = new CountDownLatch(1);
+        final boolean[] taskBScheduled = { false };
+
+        tasks.run(new Tasks.Task<Integer>(0L) {
+            @Override
+            public Integer call() {
+                return 1;
+            }
+        }, paramA -> {
+            if (!tasks.isRunning()) {
+                taskBScheduled[0] = true;
+                tasks.run(new Tasks.Task<Integer>(0L) {
+                    @Override
+                    public Integer call() {
+                        taskBRan.countDown();
+                        return 2;
+                    }
+                });
+            }
+        });
+
+        Assert.assertTrue("task B should have been scheduled and run by callback A",
+            taskBRan.await(2, TimeUnit.SECONDS));
+        Assert.assertTrue("callback A should have observed isRunning() == false and entered the schedule branch",
+            taskBScheduled[0]);
+    }
+
+    /**
+     * Regression for issue #271: callback must observe isRunning() == false
+     * so that a callback re-entering the scheduler (e.g. DefaultNetworking.check)
+     * can schedule the next task. In 24.1.5 the callback was invoked before
+     * `running` was cleared, deadlocking the request queue.
+     */
+    @Test
+    public void testCallbackSeesIsRunningFalse() throws Exception {
+        final Boolean[] runningInsideCallback = new Boolean[] { null };
+
+        tasks.run(new Tasks.Task<Integer>(0L) {
+            @Override
+            public Integer call() {
+                return 1;
+            }
+        }, param -> runningInsideCallback[0] = tasks.isRunning());
+
+        tasks.await();
+
+        Assert.assertNotNull("callback was not invoked", runningInsideCallback[0]);
+        Assert.assertEquals(Boolean.FALSE, runningInsideCallback[0]);
+    }
+
     @Test
     public void testTaskIdsWork() throws Exception {
         final int result = 123;
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
index 2122c8638..eaaa4849e 100644
--- a/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
@@ -39,7 +39,7 @@ public class TestUtils {
     static String SERVER_APP_KEY = "COUNTLY_APP_KEY";
     static String DEVICE_ID = "some_random_test_device_id";
     static String SDK_NAME = "java-native";
-    static String SDK_VERSION = "24.1.5";
+    static String SDK_VERSION = "24.1.6";
     static String APPLICATION_VERSION = "1.0";
 
     public static final String[] eKeys = new String[] { "eventKey1", "eventKey2", "eventKey3", "eventKey4", "eventKey5", "eventKey6", "eventKey7" };
diff --git a/settings.gradle b/settings.gradle
index 7ab14da37..aa989e7f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,14 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
 include ':sdk-java', ':app-java'
+
+// app-javafx uses the openjfx Gradle plugin which requires Java 11+.
+// Skip it on older JVMs so sdk-java / app-java stay buildable on Java 8.
+if (JavaVersion.current().isJava11Compatible()) {
+    include ':app-javafx'
+}