Implemented for Haleon-EGYPT and implemented upgrade SDK PD

.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

.idea/caches/deviceStreaming.xml

@@ -1,24 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="direct_access_persist.xml">
+  <component name="DeviceStreaming">
     <option name="deviceSelectionList">
       <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Sony" />
+          <option name="codename" value="A402SO" />
+          <option name="id" value="A402SO" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Sony" />
+          <option name="name" value="Xperia 10" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2520" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="27" />
           <option name="brand" value="DOCOMO" />
           <option name="codename" value="F01L" />
           <option name="id" value="F01L" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="FUJITSU" />
           <option name="name" value="F-01L" />
           <option name="screenDensity" value="360" />
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP535DL1" />
+          <option name="id" value="OP535DL1" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2409" />
+          <option name="screenDensity" value="401" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="OnePlus" />
           <option name="codename" value="OP5552L1" />
           <option name="id" value="OP5552L1" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="OnePlus" />
           <option name="name" value="CPH2415" />
           <option name="screenDensity" value="480" />
@@ -30,6 +56,7 @@
           <option name="brand" value="OPPO" />
           <option name="codename" value="OP573DL1" />
           <option name="id" value="OP573DL1" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="OPPO" />
           <option name="name" value="CPH2557" />
           <option name="screenDensity" value="480" />
@@ -41,39 +68,55 @@
           <option name="brand" value="DOCOMO" />
           <option name="codename" value="SH-01L" />
           <option name="id" value="SH-01L" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="SHARP" />
           <option name="name" value="AQUOS sense2 SH-01L" />
           <option name="screenDensity" value="480" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="Lenovo" />
-          <option name="codename" value="TB370FU" />
-          <option name="id" value="TB370FU" />
-          <option name="manufacturer" value="Lenovo" />
-          <option name="name" value="Tab P12" />
-          <option name="screenDensity" value="340" />
-          <option name="screenX" value="1840" />
-          <option name="screenY" value="2944" />
-        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="a15" />
           <option name="id" value="a15" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="A15" />
           <option name="screenDensity" value="450" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15x" />
+          <option name="id" value="a15x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16x" />
+          <option name="id" value="a16x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="a35x" />
           <option name="id" value="a35x" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="A35" />
           <option name="screenDensity" value="450" />
@@ -85,6 +128,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="a51" />
           <option name="id" value="a51" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy A51" />
           <option name="screenDensity" value="420" />
@@ -96,6 +140,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="akita" />
           <option name="id" value="akita" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8a" />
           <option name="screenDensity" value="420" />
@@ -107,6 +152,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="arcfox" />
           <option name="id" value="arcfox" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="razr plus 2024" />
           <option name="screenDensity" value="360" />
@@ -118,6 +164,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="austin" />
           <option name="id" value="austin" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g 5G (2022)" />
           <option name="screenDensity" value="280" />
@@ -129,17 +176,31 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="b0q" />
           <option name="id" value="b0q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S22 Ultra" />
           <option name="screenDensity" value="600" />
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b6q" />
+          <option name="id" value="b6q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Flip 6" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2640" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="32" />
           <option name="brand" value="google" />
           <option name="codename" value="bluejay" />
           <option name="id" value="bluejay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 6a" />
           <option name="screenDensity" value="420" />
@@ -151,6 +212,19 @@
           <option name="brand" value="google" />
           <option name="codename" value="caiman" />
           <option name="id" value="caiman" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro" />
           <option name="screenDensity" value="360" />
@@ -161,7 +235,22 @@
           <option name="api" value="34" />
           <option name="brand" value="google" />
           <option name="codename" value="comet" />
+          <option name="default" value="true" />
           <option name="id" value="comet" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="default" value="true" />
+          <option name="id" value="comet" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro Fold" />
           <option name="screenDensity" value="390" />
@@ -173,6 +262,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="crownqlteue" />
           <option name="id" value="crownqlteue" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Note9" />
           <option name="screenDensity" value="420" />
@@ -184,6 +274,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="dm2q" />
           <option name="id" value="dm2q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="S23 Plus" />
           <option name="screenDensity" value="450" />
@@ -195,17 +286,32 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="dm3q" />
           <option name="id" value="dm3q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S23 Ultra" />
           <option name="screenDensity" value="600" />
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="dubai" />
+          <option name="id" value="dubai" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 30" />
+          <option name="screenDensity" value="405" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="e1q" />
+          <option name="default" value="true" />
           <option name="id" value="e1q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S24" />
           <option name="screenDensity" value="480" />
@@ -217,6 +323,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="e3q" />
           <option name="id" value="e3q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S24 Ultra" />
           <option name="screenDensity" value="450" />
@@ -228,6 +335,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="eos" />
           <option name="id" value="eos" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Eos" />
           <option name="screenDensity" value="320" />
@@ -239,6 +347,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix" />
           <option name="id" value="felix" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold" />
           <option name="screenDensity" value="420" />
@@ -250,6 +359,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix" />
           <option name="id" value="felix" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold" />
           <option name="screenDensity" value="420" />
@@ -261,6 +371,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix_camera" />
           <option name="id" value="felix_camera" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold (Camera-enabled)" />
           <option name="screenDensity" value="420" />
@@ -272,17 +383,31 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="fogona" />
           <option name="id" value="fogona" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g play - 2024" />
           <option name="screenDensity" value="280" />
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogos" />
+          <option name="id" value="fogos" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g34 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="g0q" />
           <option name="id" value="g0q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-S906U1" />
           <option name="screenDensity" value="450" />
@@ -294,17 +419,31 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="gta9pwifi" />
           <option name="id" value="gta9pwifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-X210" />
           <option name="screenDensity" value="240" />
           <option name="screenX" value="1200" />
           <option name="screenY" value="1920" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7lwifi" />
+          <option name="id" value="gts7lwifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T870" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="gts7xllite" />
           <option name="id" value="gts7xllite" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-T738U" />
           <option name="screenDensity" value="340" />
@@ -315,7 +454,9 @@
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
           <option name="codename" value="gts8uwifi" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="gts8uwifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S8 Ultra" />
           <option name="screenDensity" value="320" />
@@ -326,7 +467,9 @@
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="gts8wifi" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="gts8wifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S8" />
           <option name="screenDensity" value="274" />
@@ -338,17 +481,31 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="gts9fe" />
           <option name="id" value="gts9fe" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S9 FE 5G" />
           <option name="screenDensity" value="280" />
           <option name="screenX" value="1440" />
           <option name="screenY" value="2304" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9wifi" />
+          <option name="id" value="gts9wifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X710" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />
           <option name="codename" value="husky" />
           <option name="id" value="husky" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8 Pro" />
           <option name="screenDensity" value="390" />
@@ -360,6 +517,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="java" />
           <option name="id" value="java" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="G20" />
           <option name="screenDensity" value="280" />
@@ -371,6 +529,19 @@
           <option name="brand" value="google" />
           <option name="codename" value="komodo" />
           <option name="id" value="komodo" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro XL" />
           <option name="screenDensity" value="360" />
@@ -382,17 +553,31 @@
           <option name="brand" value="google" />
           <option name="codename" value="lynx" />
           <option name="id" value="lynx" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 7a" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="manaus" />
+          <option name="id" value="manaus" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 40 neo" />
+          <option name="screenDensity" value="400" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="motorola" />
           <option name="codename" value="maui" />
           <option name="id" value="maui" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g play - 2023" />
           <option name="screenDensity" value="280" />
@@ -404,6 +589,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="o1q" />
           <option name="id" value="o1q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S21" />
           <option name="screenDensity" value="421" />
@@ -415,17 +601,31 @@
           <option name="brand" value="google" />
           <option name="codename" value="oriole" />
           <option name="id" value="oriole" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 6" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="pa3q" />
+          <option name="id" value="pa3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S25 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
           <option name="codename" value="panther" />
           <option name="id" value="panther" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 7" />
           <option name="screenDensity" value="420" />
@@ -437,6 +637,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="q5q" />
           <option name="id" value="q5q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Z Fold5" />
           <option name="screenDensity" value="420" />
@@ -448,6 +649,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="q6q" />
           <option name="id" value="q6q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Z Fold6" />
           <option name="screenDensity" value="420" />
@@ -458,7 +660,9 @@
           <option name="api" value="30" />
           <option name="brand" value="google" />
           <option name="codename" value="r11" />
+          <option name="formFactor" value="Wear OS" />
           <option name="id" value="r11" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Watch" />
           <option name="screenDensity" value="320" />
@@ -471,6 +675,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="r11q" />
           <option name="id" value="r11q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-S711U" />
           <option name="screenDensity" value="450" />
@@ -482,6 +687,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="redfin" />
           <option name="id" value="redfin" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 5" />
           <option name="screenDensity" value="440" />
@@ -493,6 +699,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="shiba" />
           <option name="id" value="shiba" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8" />
           <option name="screenDensity" value="420" />
@@ -504,6 +711,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="t2q" />
           <option name="id" value="t2q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S21 Plus" />
           <option name="screenDensity" value="394" />
@@ -514,18 +722,34 @@
           <option name="api" value="33" />
           <option name="brand" value="google" />
           <option name="codename" value="tangorpro" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="tangorpro" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Tablet" />
           <option name="screenDensity" value="320" />
           <option name="screenX" value="1600" />
           <option name="screenY" value="2560" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tegu" />
+          <option name="id" value="tegu" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />
           <option name="codename" value="tokay" />
+          <option name="default" value="true" />
           <option name="id" value="tokay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9" />
           <option name="screenDensity" value="420" />
@@ -536,13 +760,27 @@
           <option name="api" value="35" />
           <option name="brand" value="google" />
           <option name="codename" value="tokay" />
+          <option name="default" value="true" />
           <option name="id" value="tokay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="xcover7" />
+          <option name="id" value="xcover7" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-G556B" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2408" />
+        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/gradle.xml

@@ -4,8 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -13,7 +14,6 @@
             <option value="$PROJECT_DIR$/library" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -42,7 +42,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="ms-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -2,15 +2,15 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Haleon_Kenya_pd-git.iml" filepath="$PROJECT_DIR$/.idea/modules/Haleon_Kenya_pd-git.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/HALEON_KENYA_PD.iml" filepath="$PROJECT_DIR$/.idea/modules/HALEON_KENYA_PD.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.main.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.main.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.main.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.main.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.unitTest.iml" />
     </modules>
   </component>
 </project>

.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

GSKMTOrange/build.gradle

@@ -3,9 +3,9 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'org.jetbrains.kotlin.android'
 android {
-    compileSdk(34)
+    namespace("cpm.com.gskmtorange")
-    useLibrary 'org.apache.http.legacy'
+    compileSdk(35)
-    namespace "cpm.com.gskmtorange"
+
     lintOptions {
         checkReleaseBuilds false
         disable 'MissingTranslation'
@@ -13,16 +13,17 @@ android {
     }
 
     configurations {
-       // all*.exclude module: 'okio'
+        all*.exclude module: 'support-v4'
-       // all*.exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+        // This removes all other versions of `support-v4` if gets duplicated from all the artifacts.
-        all*.exclude module: 'support-v4' // This removes all other versions of `support-v4` if gets duplicated from all the artifacts.
     }
 
     defaultConfig {
         applicationId "cpm.com.gskmtorange"
         minSdkVersion 24
-        targetSdk(34)
+        targetSdk(35)
         multiDexEnabled true
+        useLibrary 'org.apache.http.legacy'
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk { abiFilters.add("armeabi-v7a")
             abiFilters.add("arm64-v8a")
         }
@@ -30,23 +31,18 @@ android {
        // For Lebanon
         /*versionCode 1
         versionName "1.0"*/
-
         //For Egypt
-        /*versionCode 35
+        versionCode 35
-        versionName "4.6"*/
+        versionName "4.6"
-
         //For UAE
         /*versionCode 29
         versionName "4.1"*/
-
         //For Turkey
        /* versionCode 34
         versionName "4.6"*/
-
         //For Turkey
          /*versionCode 32
          versionName "4.4"*/
-
         //For KSA
         /*versionCode 28
         versionName "4.0"*/
@@ -54,132 +50,117 @@ android {
       //  aading price facing
        /* versionCode 27
         versionName "3.8"*/
-
         //sa
        /* versionCode 28
         versionName "3.9"*/
-
+       /* //Kenya
-        //Kenya
         versionCode 2
-        versionName "1.1"
+        versionName "1.1"*/
-
         //kenya-lite
        /* versionCode 2
         versionName "1.1"*/
-
         //nigeria
          /*versionCode 1
          versionName "1.0"*/
-
         //For jordan
          /* versionCode 7
           versionName "1.6"*/
-
         //For Kuwait
           /*versionCode 1
           versionName "1.0"*/
-
         //For Bahrain
         /*versionCode 1
         versionName "1.0"*/
-
          //For QATAR
         /*versionCode 1
         versionName "1.0"*/
-
         //For Libya
         /*versionCode 3
         versionName "1.2"*/
-
         //For Oman
         /*versionCode 1
         versionName "1.0"*/
-
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     signingConfigs {
         config {
             keyAlias 'hp'
             keyPassword 'android'
-            storeFile file('D:\\keystore\\hp.dat')
+            storeFile file('D:\\jeevanp_cpm_projects\\keystore\\hp.dat')
             storePassword 'android'
         }
     }
+
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             debuggable true
             signingConfig signingConfigs.config
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'proguard-camera-lib.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
+
     firebaseCrashlytics {
         nativeSymbolUploadEnabled true
     }
-    /*firebaseCrashlytics {
-        mappingFileUploadEnabled false
-    }*/
 
     buildFeatures {
         viewBinding = true
     }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/gradle/incremental.annotation.processors'
+        exclude 'META-INF/AL2.0'
+        exclude 'META-INF/LGPL2.1'
+    }
+    kotlin {
+        jvmToolchain(17)
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation files('libs/ksoap2-android-assembly-3.0.0-jar-with-dependencies.jar')
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation project(path: ':library')
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.firebase:firebase-auth:20.0.3'
+    implementation 'androidx.activity:activity:1.10.1'
-    implementation 'androidx.activity:activity:1.9.3'
+    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'junit:junit:4.13.1'
     implementation 'android.arch.navigation:navigation-fragment:1.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
-    implementation 'com.github.bumptech.glide:glide:4.15.1'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
-    //implementation 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
-   // implementation 'com.github.leocadiotine:ksoap2-android:3.6.2'
 
-    implementation platform('com.google.firebase:firebase-bom:26.7.0')
+
-   // implementation 'com.google.firebase:firebase-analytics'
+   implementation platform('com.google.firebase:firebase-bom:33.14.0')
-    implementation 'com.google.firebase:firebase-crashlytics-ndk'
+    implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.android.gms:play-services-location:21.3.0'
+    implementation 'com.google.android.gms:play-services-maps:19.2.0'
+    implementation 'com.google.firebase:firebase-analytics:22.4.0'
+    implementation 'com.google.firebase:firebase-appindexing:20.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:19.4.3'
+    implementation 'com.google.firebase:firebase-auth:23.2.1'
+
 
-    implementation 'com.google.android.gms:play-services-location:17.1.0'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    //implementation 'com.kyanogen.signatureview:signature-view:1.0'
-   // implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta1'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.google.firebase:firebase-appindexing:10.2.1'
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
-    // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
-    // Recommended: Add the Google Analytics SDK.
-    implementation 'com.google.firebase:firebase-analytics:18.0.0'
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.multidex:multidex:2.0.1'
-    //using stable version
-  // implementation 'com.github.pratham-PDots:camera_lib:1.5.1'
-  // implementation 'com.github.pratham-PDots:camera_lib:1.5.0-external-2'
-   // implementation 'com.github.pratham-PDots:camera_lib:1.5.1.0'
     // Main SDK dependency
-    implementation("com.github.pratham-PDots:camera_lib:1.5.1.1")
+   // implementation("com.github.pratham-PDots:camera_lib:1.5.1.1")
-    /*implementation 'androidx.activity:activity-ktx:1.9.0'
+    implementation("com.github.pratham-PDots:camera_lib:1.5.3.2")
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'*/
 }
 
 
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'org.jetbrains.kotlin.android'
-
-

GSKMTOrange/release/output-metadata.json

@@ -11,10 +11,11 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 2,
+      "versionCode": 35,
-      "versionName": "1.1",
+      "versionName": "4.6",
       "outputFile": "GSKMTOrange-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "minSdkVersionForDexing": 24
 }

GSKMTOrange/src/main/AndroidManifest.xml

@@ -8,14 +8,13 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
@@ -61,90 +60,105 @@
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".gsk_dailyentry.StockEntryActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.VisitTypeStatusActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="Ad hoc - Visit Type"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.OrderStatusDetailActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.OrderConfirmActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.OrderTakingActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.NewStockDataActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_new_stock_data"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.CounterfeitIndicatorWebActivity"
             android:label="@string/title_activity_counterfeit_indicator_web"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.StockPricingActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_stock_pricing"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".pharma_stores.PharmaActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_paharma"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.StockActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/stock"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.CounterfeitProductsActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_counterfeit_products"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".password.MPinActivity"
             android:label="@string/title_activity_mpin"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".password.ChangePasswordActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_change_password"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".SplashScreenActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:exported="true"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -156,50 +170,59 @@
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_login"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".MainActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/main_menu_activity_name"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".autoupdate.AutoUpdateActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".SelectLanguageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_select_language"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".download.DownloadActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".GeoTag.GeoTagStoreList"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.StoreListActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.StoreimageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_store_image"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".GeoTag.GeoTagActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_store_geotag"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <!--
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
@@ -213,137 +236,160 @@
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" /> <!-- Gagan Start Declaration -->
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/> <!-- Gagan Start Declaration -->
         <activity
             android:name=".gsk_dailyentry.CategoryListActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.CategoryWisePerformanceActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.DailyDataMenuActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.MSL_AvailabilityActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.Stock_FacingActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.PromoComplianceActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.StoreWisePerformanceActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" /> <!-- Gagan End Declaration -->
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/> <!-- Gagan End Declaration -->
         <activity
             android:name=".dailyentry.NonWorkingReason"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_Non_Work"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.AdditionalVisibility"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_Additional_visibility"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".upload.UploadActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_upload"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.SettingsActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_settings"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.CheckoutActivity"
             android:label="@string/title_activity_checkout"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.ServiceActivity"
             android:label="@string/title_activity_service"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".upload.PreviousDataUploadActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_upload"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.T2pBrand_Avaibility"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_t2p_brand__avaibility"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.StockFacing_PlanogramTrackerActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_stock_facing__planogram_tracker"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.CategoryPicture"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_category_picture"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.StoreCheckoutImageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_store_checkout_image"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".gsk_dailyentry.MSL_Availability_StockFacingActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.FutureJCPActivity"
             android:label=""
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.CreateSelfActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_create_self"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.NoCameraActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_create_self"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.PlanogramPDFActivity"
             android:label="@string/category_performance_PLANOGRAM"
@@ -354,13 +400,15 @@
             android:label="@string/title_activity_stock_data"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
         <activity
             android:name=".dailyentry.AuditActivity"
             android:label="@string/audit"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
 
         <service
             android:name=".service.FCMNotificationService"

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/PD_CONFIGURATION.java

@@ -0,0 +1,20 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+import java.util.ArrayList;
+
+public class PD_CONFIGURATION {
+    ArrayList<String> PROJECT_ID = new ArrayList<>();
+    ArrayList<String> USER_ID = new ArrayList<>();
+    public ArrayList<String> getUSER_ID() {
+        return USER_ID;
+    }
+    public void setUSER_ID(String USER_ID) {
+        this.USER_ID.add(USER_ID);
+    }
+    public ArrayList<String> getPROJECT_ID() {
+        return PROJECT_ID;
+    }
+    public void setPROJECT_ID(String PROJECT_ID) {
+        this.PROJECT_ID.add(PROJECT_ID);
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -31,6 +31,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
@@ -80,12 +81,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cpm.com.gskmtorange.GetterSetter.PD_CONFIGURATION;
 import cpm.com.gskmtorange.autoupdate.AutoUpdateActivity;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.password.MPinActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
 import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
 //import io.fabric.sdk.android.Fabric;
 
@@ -590,7 +593,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
         @Override
         protected String doInBackground(Void... params) {
             try {
-                Log.e("latitudedata",lat + ","+ lon);
+                Log.e("latitudedata", lat + "," + lon);
                 versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
                 String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]"
                         + userid + "[/USER_ID]" + "[PASSWORD]" + password
@@ -607,8 +610,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                 request.addProperty("onXML", userauth_xml);
                 Log.d("loginrequest", String.valueOf(request));
 
-                SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
+                SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
-                        SoapEnvelope.VER11);
                 envelope.dotNet = true;
                 envelope.setOutputSoapObject(request);
                 try {
@@ -616,46 +618,20 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                             CommonString.URL);
                     androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
                             envelope);
-                } catch (Exception e){
+                } catch (Exception e) {
-                    Log.e("httpexception",e.getMessage());
+                    Log.e("httpexception", e.getMessage());
                 }
-                /*HttpTransportSE androidHttpTransport = new HttpTransportSE(
-                        CommonString.URL);
-                androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
-                        envelope);*/
 
                 Object result = (Object) envelope.getResponse();
-
+                if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
-                if (result.toString()
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_FAILURE));
-                        .equalsIgnoreCase(CommonString.KEY_FAILURE)) {
-
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-
-                            showAlert(CommonString.MESSAGE_FAILURE);
-                        }
-                    });
 
                 } else if (result.toString().equalsIgnoreCase(
                         CommonString.KEY_FALSE)) {
-                    runOnUiThread(new Runnable() {
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_FALSE));
-                        @Override
-                        public void run() {
-                            showAlert(CommonString.MESSAGE_FALSE);
-                        }
-                    });
-
                 } else if (result.toString().equalsIgnoreCase(
                         CommonString.KEY_CHANGED)) {
-                    runOnUiThread(new Runnable() {
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_CHANGED));
-                        @Override
-                        public void run() {
-                            showAlert(CommonString.MESSAGE_CHANGED);
-                        }
-                    });
-
                 } else {
 
                     XmlPullParserFactory factory = XmlPullParserFactory
@@ -671,47 +647,52 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
                     if (failureGetterSetter.getStatus().equalsIgnoreCase(
                             CommonString.KEY_FAILURE)) {
-                       /* final AlertMessage message = new AlertMessage(
+                        runOnUiThread(() -> {
-                                LoginActivity.this, CommonString.METHOD_LOGIN
-                                + failureGetterSetter.getErrorMsg(),
-                                "login", null);*/
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
                             // TODO Auto-generated method stub
                             showAlert(CommonString.METHOD_LOGIN
                                     + failureGetterSetter.getErrorMsg());
-                            }
                         });
                     } else {
 
-                        try {
-                            // For String source
 
+                        // For String source
                         xpp.setInput(new StringReader(result.toString()));
                         xpp.next();
                         eventType = xpp.getEventType();
                         lgs = XMLHandlers.loginXMLHandler(xpp, eventType);
 
-                        } catch (XmlPullParserException e) {
+                        //PD_CONFIGURATION
-                            e.printStackTrace();
+                        request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
-                        } catch (IOException e) {
+                        request.addProperty("UserName", userid);
-                            e.printStackTrace();
+                        request.addProperty("Type", "PD_CONFIGURATION");
-                        }
+                        request.addProperty("cultureid", "1");
+                        envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                        envelope.dotNet = true;
+                        envelope.setOutputSoapObject(request);
+                        HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                        androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+                        result = envelope.getResponse();
+                        xpp.setInput(new StringReader(result.toString()));
+                        xpp.next();
+                        eventType = xpp.getEventType();
+                        PD_CONFIGURATION pdConfiguration = XMLHandlers.PDConfigXMLHandler(xpp);
+                        Log.e("PD_CONFIGURATION_RESULT", result.toString());
                         // PUT IN PREFERENCES
+                        if (pdConfiguration.getPROJECT_ID() != null && !pdConfiguration.getPROJECT_ID().isEmpty()) {
+                            editor.putString(CommonString.KEY_PD_PROJECT_Id, pdConfiguration.getPROJECT_ID().get(0));
+                            editor.putString(CommonString.KEY_PD_USER_Id, pdConfiguration.getUSER_ID().get(0));
+                        } else {
+                            return CommonString.KEY_FAILURE;
+                        }
                         editor.putString(CommonString.KEY_USERNAME, userid);
                         editor.putString(CommonString.KEY_PASSWORD, password);
                         editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
                         editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
-                        //editor.putString(CommonString.KEY_DATE, "12/05/2022");
                         editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
-                        //editor.putString(CommonString.KEY_DATE, "01/25/2019");
                         editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
-                        Log.e("countryid",lgs.getCOUNTRY_ID());
+                        Log.e("countryid", lgs.getCOUNTRY_ID());
                         editor.commit();
                         setDataFromSharedPreferences(lgs);
-
                         Bundle bundle = new Bundle();
                         bundle.putString(FirebaseAnalytics.Param.ITEM_ID, userid);
                         bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, CommonString.KEY_LOGIN_DATA);
@@ -738,15 +719,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
             } catch (IOException e) {
                 FirebaseCrashlytics.getInstance().recordException(e);
-               /* final AlertMessage message = new AlertMessage(
-                        LoginActivity.this,
-                        AlertMessage.MESSAGE_SOCKETEXCEPTION, "socket_login", e);*/
-
                 counter++;
-                runOnUiThread(new Runnable() {
+                runOnUiThread(() -> {
-
-                    @Override
-                    public void run() {
                     // TODO Auto-generated method stub
                     if (counter < 3) {
                         new AuthenticateTask().execute();
@@ -754,22 +728,10 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                         showAlert(getString(R.string.nonetwork));
                         counter = 1;
                     }
-                    }
                 });
             } catch (Exception e) {
                 FirebaseCrashlytics.getInstance().recordException(e);
-              /*  final AlertMessage message = new AlertMessage(
+                runOnUiThread(() -> showAlert(CommonString.MESSAGE_EXCEPTION));
-                        LoginActivity.this, AlertMessage.MESSAGE_EXCEPTION,
-                        "acra_login", e);*/
-                // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
-                //   Crashlytics.logException(e.getCause());
-                //  Crashlytics.logException(new Exception("My custom login Exception"));
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        showAlert(CommonString.MESSAGE_EXCEPTION);
-                    }
-                });
             }
             return "";
         }
@@ -777,13 +739,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
         @Override
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
-            //Stop performance trace
+            if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
-            ///   myTrace.stop();
-
-            if (result.equals(CommonString.KEY_SUCCESS)) {
                 // manually set true for South Africa
                 boolean forSA = false;
-			//	database.open();
                 if (forSA) {
                     //For SA Only
                     if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
@@ -872,26 +830,23 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             cdate = arabicToenglish(cdate);
         } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
             cdate = arabicToenglish(cdate);
-        }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
             cdate = arabicToenglish(cdate);
-        }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
             cdate = arabicToenglish(cdate);
-        }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
             cdate = arabicToenglish(cdate);
-        }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
             cdate = arabicToenglish(cdate);
-        }
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
-        else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
             cdate = arabicToenglish(cdate);
-        }
+        } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
-        else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
             cdate = arabicToenglish(cdate);
         }
         return cdate;
     }
 
 
-
     private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
         Gson gson = new Gson();
         String jsonCurProduct = gson.toJson(lgs);
@@ -935,18 +890,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             } else if (requestCode == MY_PERMISSIONS_REQUEST_STORAGE_READ) {
                 checkAppPermission(Manifest.permission.ACCESS_FINE_LOCATION, MY_PERMISSIONS_REQUEST_LOCATION);
             } else {
-
-                // Create a Folder for Images
-
-               /* File file = new File(Environment.getExternalStorageDirectory(), ".GSK_MT_ORANGE_IMAGES");
-                if (!file.isDirectory()) {
-                    file.mkdir();
-                }
-                File file_planogram = new File(Environment.getExternalStorageDirectory(), "GSK_MT_ORANGE_Planogram_Images");
-                if (!file_planogram.isDirectory()) {
-                    file_planogram.mkdir();
-                }*/
-
                 if (checkPlayServices()) {
                     // Building the GoogleApi client
                     buildGoogleApiClient();
@@ -1005,7 +948,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
         }
         checkgpsEnableDevice();
-        locationRequest= new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 100000)
+        locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 100000)
                 .setWaitForAccurateLocation(false)
                 .setMinUpdateIntervalMillis(IMPLICIT_MIN_UPDATE_INTERVAL)
                 .setMaxUpdateDelayMillis(1000)
@@ -1136,7 +1079,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
     @Override
     public void onConnected(Bundle bundle) {
-        Log.e("onConnectdata","true" + ","+mGoogleApiClient);
+        Log.e("onConnectdata", "true" + "," + mGoogleApiClient);
         /*if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             // TODO: Consider calling
             //    ActivityCompat#requestPermissions

GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java

@@ -85,8 +85,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
     public void onClick(View view) {
         int id = view.getId();
 
-        switch (id) {
+        if (id == R.id.btn_language_one) {
-            case R.id.btn_language_one:
             selected_flag = true;
             CommonFunctions.updateLangResources(context, language.get(0));
             btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
@@ -97,9 +96,8 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
             editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0));
             editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0));
             editor.commit();
-                break;
 
-            case R.id.btn_language_two:
+        } else if (id == R.id.btn_language_two) {
             selected_flag = true;
             CommonFunctions.updateLangResources(context, language.get(1));
             btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
@@ -110,8 +108,8 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
             editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1));
             editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(1));
             editor.commit();
-                break;
         }
+
     }
     
     private void setDataFromSharedPreferences(LoginGetterSetter lgs) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -8,11 +8,12 @@ import cpm.com.gskmtorange.AppUtils;
 /**
  * Created by yadavendras on 19-12-2016.
  */
+
 public class CommonString {
-    public static final String BACKUP_PATH = Environment.getExternalStorageDirectory().getPath() + "/gsk_orange_backup";
-    // webservice constants
     // preferenec keys
     public static final String PD_PROJECT_iD = "4f57635b-6b07-45bf-bfba-c61c2826b6db";
+    public static final String KEY_PD_PROJECT_Id = "PD_PROJECT_Id";
+    public static final String KEY_PD_USER_Id = "PD_USER_Id";
     public static final String KEY_USERNAME = "username";
     public static final String KEY_PASSWORD = "password";
     public static final String KEY_DATE = "date";

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonUtils.kt

@@ -1,11 +1,10 @@
 package cpm.com.gskmtorange.constant
 
 import android.content.Context
-import android.net.Uri
 import android.util.Log
 import android.util.Patterns
 import android.widget.ImageView
-import android.widget.Toast
+import androidx.core.net.toUri
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Priority
@@ -15,13 +14,14 @@ import com.sj.camera_lib_android.utils.CameraSDK.init
 import java.io.File
 
 object CommonUtils {
-    fun initializePDSDK(context: Context?, _userId: String?) {
+    fun initializePDSDK(context: Context?,projectId:String, _userId: String?) {
         if (context != null) {
             if (_userId != null) {
-                init(context, CommonString.PD_PROJECT_iD, _userId)
+                init(context = context, projectId = projectId, userId = _userId)
             }
         }
     }
+
     fun imgPreviewwithError(context: Context, url: String, imgView: ImageView, resId: Int) {
         val circularProgressDrawable = CircularProgressDrawable(context).apply {
             strokeWidth = 5f
@@ -31,14 +31,7 @@ object CommonUtils {
         val options: RequestOptions =
             RequestOptions().centerCrop().placeholder(circularProgressDrawable).error(resId)
                 .diskCacheStrategy(DiskCacheStrategy.ALL).priority(Priority.HIGH)
-
         Glide.with(context).load(url).apply(options).into(imgView)
-       /* Glide.with(context).load(url).apply(options).into(imgView)
-        Glide.get(context).clearMemory()*/
-        // Clear disk cache in a background thread
-       /* Thread {
-            Glide.get(context).clearDiskCache()
-        }.start()*/
     }
 
     fun isValidUrl(url: String): Boolean {
@@ -46,15 +39,12 @@ object CommonUtils {
     }
 
     fun deleteSpecificImage(context: Context,filePath: String?) {
-       // val file = File(context.filesDir, "")
         if (!filePath.isNullOrEmpty()) {
            val  file = File(filePath)
-            //Log.d("filedatanew", file.toString());
             if (file.exists()) {
                 val isDeleted = file.delete()
                 if (isDeleted) {
                     Log.d("deletefile","File deleted successfully");
-                  //  Toast.makeText(context, "File deleted successfully", Toast.LENGTH_SHORT).show()
                 } else {
                     println("Failed to delete file")
                 }
@@ -65,7 +55,7 @@ object CommonUtils {
     }
 
     fun deleteImage(context: Context, filePath: String) {
-        val uri = Uri.parse(filePath)
+        val uri = filePath.toUri()
         val contentResolver = context.contentResolver
         val deleted = contentResolver.delete(uri, null, null)
         if (deleted > 0) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java

@@ -1,5 +1,6 @@
 package cpm.com.gskmtorange.dailyentry;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -219,8 +220,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
-        switch (parent.getId()) {
+        if (parent.getId() == R.id.sp_sub_category) {
-            case R.id.sp_sub_category:
 
             if (position != 0) {
                 sub_category = sub_category_list.get(position).getSub_category();
@@ -233,18 +233,15 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
                 brand_select.setBRAND(str);
                 brand_select.setBRAND_ID("0");
                 brand_list.add(0, brand_select);
-                    CustomBrandAdapter adapter = new CustomBrandAdapter(AdditionalPromoSKUwiseActivity.this, R.layout.custom_spinner_item, brand_list);
 
+                CustomBrandAdapter adapter = new CustomBrandAdapter(AdditionalPromoSKUwiseActivity.this, R.layout.custom_spinner_item, brand_list);
                 spinner_brand_list.setAdapter(adapter);
                 spinner_brand_list.setOnItemSelectedListener(this);
             } else {
-
                 clearBrandSpinner();
             }
 
-                break;
+        } else if (parent.getId() == R.id.sp_brand) {
-
-            case R.id.sp_brand:
 
             if (position != 0) {
                 brand = brand_list.get(position).getBRAND().get(0);
@@ -257,46 +254,32 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
                 sku_select.setSKU(str);
                 sku_select.setSKU_ID("0");
                 sku_list.add(0, sku_select);
-                    CustomSkuAdapter adapter = new CustomSkuAdapter(AdditionalPromoSKUwiseActivity.this, R.layout.custom_spinner_item, sku_list);
 
+                CustomSkuAdapter adapter = new CustomSkuAdapter(AdditionalPromoSKUwiseActivity.this, R.layout.custom_spinner_item, sku_list);
                 spinner_sku_list.setAdapter(adapter);
                 spinner_sku_list.setOnItemSelectedListener(this);
             } else {
-
                 clearSkuSpinner();
             }
 
-                break;
+        } else if (parent.getId() == R.id.sp_sku) {
-
-            case R.id.sp_sku:
 
             if (position != 0) {
                 sku = sku_list.get(position).getSKU().get(0);
                 sku_id = sku_list.get(position).getSKU_ID().get(0);
             }
 
-                break;
+        } else if (parent.getId() == R.id.sp_flasher) {
-
-            case R.id.sp_flasher:
-
-                switch (position) {
-
-                    case 0:
 
+            if (position == 0) {
                 price_flasher_available = -1;
-                        break;
+            } else if (position == 1) {
-
-                    case 1:
                 price_flasher_available = 1;
-                        break;
+            } else if (position == 2) {
-
-                    case 2:
                 price_flasher_available = 0;
-                        break;
+            }
         }
 
-                break;
-        }
     }
 
     @Override
@@ -336,9 +319,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
     public void onClick(View v) {
         int id = v.getId();
 
-        switch (id) {
+        if (id == R.id.fab) {
-
-            case R.id.fab:
 
             boolean valid_flag = true;
 
@@ -351,85 +332,25 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
             if (!valid_flag) {
                 Snackbar.make(rec_added_promo, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
             } else if (isdata_added) {
-
                 db.InsertPromoSKUwiseData(added_promo_list, categoryId, store_id, isExists);
                 finish();
                 overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-
-                    /*String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
-
-                    db.open();
-                    ArrayList<PromoComplianceSkuwiseGetterSetter> promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters;
-                    promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(store_id, null);
-                    if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
-
-                        for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
-
-                            promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
-
-                            for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
-                                if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
-
-                                    String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
-                                    if (discount_val.equals("")) {
-                                        discount_val = "0";
-                                    }
-
-                                    add_xml = "[PROMOTION_DATA]"
-                                            + "[MID]" + "0" + "[/MID]"
-                                            + "[USER_ID]" + username + "[/USER_ID]"
-                                            + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                            + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
-                                            + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
-                                            + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
-                                            + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
-                                            + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
-                                            + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
-                                            + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
-                                            + "[/PROMOTION_DATA]";
-                                    add_promotion_data_xml = add_promotion_data_xml + add_xml;
-                                }
-                            }
-
-                            int exists = 0;
-                            if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
-                                exists = 1;
-                            }
-
-                            exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
-                                    + "[MID]" + "0" + "[/MID]"
-                                    + "[USER_ID]" + username + "[/USER_ID]"
-                                    + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
-                                    + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
-                                    + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
-                                    + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
-
-                            promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
-
-                        }
-
-                        final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
-                        Log.d("sosdata", sos_xml);
-                    }*/
-
             } else {
                 finish();
             }
 
-                break;
+        } else if (id == R.id.fab_add) {
 
-            case R.id.fab_add:
             discount = et_discount.getText().toString();
             price = et_price.getText().toString();
+
             if (sub_category.equals("")) {
                 Snackbar.make(rec_added_promo, R.string.pls_select_sub_category, Snackbar.LENGTH_SHORT).show();
             } else if (brand.equals("")) {
                 Snackbar.make(rec_added_promo, R.string.pls_select_brand, Snackbar.LENGTH_SHORT).show();
             } else if (sku.equals("")) {
                 Snackbar.make(rec_added_promo, R.string.pls_select_sku, Snackbar.LENGTH_SHORT).show();
-                }/*else if(discount.equals("")){
+            } else if (price.equals("")) {
-                    Snackbar.make(rec_added_promo, R.string.pls_enter_discount,Snackbar.LENGTH_SHORT).show();
-                }*/ else if (price.equals("")) {
                 Snackbar.make(rec_added_promo, R.string.pls_enter_price, Snackbar.LENGTH_SHORT).show();
             } else if (!price.equals("") && price.substring(0, 1).equals(".")) {
                 Snackbar.make(rec_added_promo, R.string.incorrect_price, Snackbar.LENGTH_SHORT).show();
@@ -478,44 +399,37 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
                 } else {
                     img_cam.setBackgroundResource(R.mipmap.camera_orange);
                 }
+
                 isdata_added = true;
             }
 
-                break;
+        } else if (id == R.id.img_promotion_add) {
-
-            case R.id.img_promotion_add:
 
             _pathforcheck = "Additional_Promo_Skuwise_Image" + store_id + categoryId + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
 
             startCameraActivity(1);
-                break;
 
-            case R.id.btntoggle:
+        } else if (id == R.id.btntoggle) {
+
             isExists = btntoggle.isChecked();
 
             if (isExists) {
                 lin_parent.setVisibility(View.VISIBLE);
-                    fab_add.show();//.setVisibility(View.VISIBLE);
+                fab_add.show();
             } else {
                 android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalPromoSKUwiseActivity.this);
                 builder.setTitle("Parinaam");
-                    builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false).setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+                builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+                        .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
-
+                                fab_add.hide();
-                            fab_add.hide();//.setVisibility(View.GONE);
                                 added_promo_list.clear();
 
                                 rec_added_promo.setLayoutManager(new LinearLayoutManager(context));
                                 promoAdapter = new PromoAdapter(added_promo_list);
                                 rec_added_promo.setAdapter(promoAdapter);
 
-                                  /*  if(promoAdapter!=null){
-                                        promoAdapter.list.clear();
-                                        promoAdapter.notifyDataSetChanged();
-                                    }*/
-
                                 lin_parent.setVisibility(View.GONE);
 
                                 sub_category = "";
@@ -533,25 +447,26 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
                                 spinner_sub_category_list.setSelection(0);
                                 clearBrandSpinner();
                                 clearSkuSpinner();
+
                                 if (is_camera_compulsory) {
                                     img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
                                 } else {
                                     img_cam.setBackgroundResource(R.mipmap.camera_orange);
                                 }
-                            isdata_added = true;
 
+                                isdata_added = true;
                             }
-                    }).setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        })
+                        .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                            //checkBox.setChecked(true);
                                 btntoggle.setChecked(true);
                             }
                         });
+
                 android.app.AlertDialog alert = builder.create();
                 alert.show();
             }
-                break;
         }
     }
 
@@ -877,90 +792,12 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
         }
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     public void onBackPressed() {
         ischanged();
     }
 
-    /*@Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_promo_skuwise, menu);
-
-        final CheckBox checkBox = (CheckBox) menu.findItem(R.id.menuShowDue).getActionView();
-        checkBox.setText(R.string.exists);
-        checkBox.setChecked(isExists);
-
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                isExists = isChecked;
-
-                if(isExists){
-                    lin_parent.setVisibility(View.VISIBLE);
-                    fab_add.show();//.setVisibility(View.VISIBLE);
-                }
-                else {
-                    android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalPromoSKUwiseActivity.this);
-                    builder.setTitle("Parinaam");
-                    builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
-                            .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int id) {
-
-                                    fab_add.hide();//.setVisibility(View.GONE);
-                                    added_promo_list.clear();
-
-                                    rec_added_promo.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
-                                    promoAdapter = new PromoAdapter(added_promo_list);
-                                    rec_added_promo.setAdapter(promoAdapter);
-
-                                  *//*  if(promoAdapter!=null){
-                                        promoAdapter.list.clear();
-                                        promoAdapter.notifyDataSetChanged();
-                                    }*//*
-
-                                    lin_parent.setVisibility(View.GONE);
-
-                                    sub_category = "";
-                                    sub_category_id = "0";
-                                    brand= "";
-                                    brand_id = "0";
-                                    sku = "";
-                                    sku_id = "0";
-                                    discount = "";
-                                    price = "";
-                                    img_str = "";
-
-                                    et_discount.setText("");
-                                    et_price.setText("");
-                                    spinner_sub_category_list.setSelection(0);
-                                    clearBrandSpinner();
-                                    clearSkuSpinner();
-                                    if(is_camera_compulsory){
-                                        img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
-                                    }
-                                    else {
-                                        img_cam.setBackgroundResource(R.mipmap.camera_orange);
-                                    }
-                                    isdata_added = true;
-
-                                }
-                            })
-                            .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    checkBox.setChecked(true);
-                                }
-                            });
-                    android.app.AlertDialog alert = builder.create();
-                    alert.show();
-                }
-            }
-        });
-
-        return true;
-    }*/
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle action bar item clicks here. The action bar will

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java

@@ -4,23 +4,15 @@ import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
@@ -28,10 +20,7 @@ import org.ksoap2.transport.HttpTransportSE;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Locale;
 
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
@@ -41,7 +30,6 @@ import cpm.com.gskmtorange.adapter.data.ImageUri;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.constant.CommonUtils;
-import cpm.com.gskmtorange.download.DownloadActivity;
 
 public class CheckoutActivity extends AppCompatActivity {
     private Context context;
@@ -145,10 +133,6 @@ public class CheckoutActivity extends AppCompatActivity {
 
                 if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
                     deleteIRURl();
-
-                 /*  new Handler(Looper.getMainLooper()).postDelayed({
-                            notifyDataSetChanged()
-                    }, 5000);*/
                     db.open();
                     db.updateCheckoutOuttime(store_id, CommonFunctions.getCurrentTimeWithLanguage(context), CommonString.KEY_Y, checkOutImagePath);
                     SharedPreferences.Editor editor = preferences.edit();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java

@@ -33,6 +33,7 @@ import com.androidbuts.multispinnerfilter.MultiSpinnerSearch;
 import com.androidbuts.multispinnerfilter.SpinnerListener;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -114,8 +115,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
         if (configurationData.size() > 0) {
 
             for (int i = 0; i < configurationData.size(); i++) {
-                if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COACHING VISIT IMAGE") &&
+                if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COACHING VISIT IMAGE") && configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
-                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
                     coaching_visit_camera_flag = true;
                     break;
                 }
@@ -131,8 +131,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         supervisorList = database.getSupervisorListData();
 
-        exist_adapter = new ArrayAdapter<>(this,
+        exist_adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
-                android.R.layout.simple_spinner_item);
 
         String select_str = getResources().getString(R.string.select);
 
@@ -142,8 +141,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         exist_spinner.setAdapter(exist_adapter);
 
-        exist_adapter
+        exist_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 
         exist_spinner.setOnItemSelectedListener(this);
 
@@ -168,43 +166,19 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
-        switch (parent.getId()) {
+        if (parent.getId() == R.id.spinner_coaching_visit) {
-            case R.id.spinner_coaching_visit:
+
             if (position != 0) {
 
                 if (!update_flag) {
 
-                        fab_save.show();//setVisibility(View.VISIBLE);
+                    fab_save.show(); //setVisibility(View.VISIBLE);
 
                     if (position == 1) {
 
                         linear_supervisor.setVisibility(View.VISIBLE);
-
                         coaching_visit = 1;
 
-                            /*supervisor_adapter = new ArrayAdapter<CharSequence>(this,
-                                    android.R.layout.simple_spinner_item);
-
-                            String select_str = getResources().getString(R.string.select_promo);
-
-                            supervisor_adapter.add(select_str);
-
-                            for (int i = 0; i < supervisorList.size(); i++) {
-                                supervisor_adapter.add(supervisorList.get(i).getSUPERVISOR().get(0));
-                            }
-
-                            supervisor_spinner.setAdapter(supervisor_adapter);
-
-                            supervisor_adapter
-                                    .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-                            supervisor_spinner.setOnItemSelectedListener(this);*/
-
-                            /**
-                             * Getting array of String to Bind in Spinner
-                             */
-                            //final List<String> list = Arrays.asList(getResources().getStringArray(R.array.sports_array));
-
                         final List<KeyPairBoolData> listArray0 = new ArrayList<>();
 
                         for (int i = 0; i < supervisorList.size(); i++) {
@@ -216,7 +190,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
                         }
 
                         multi_spinner_supervisor.setItems(listArray0, -1, new SpinnerListener() {
-
                             @Override
                             public void onItemsSelected(List<KeyPairBoolData> items) {
 
@@ -224,7 +197,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
                                 for (int i = 0; i < items.size(); i++) {
                                     if (items.get(i).isSelected()) {
-
                                         selectedSupervisorList.add(items.get(i).getName());
                                         Log.i("MultiSpinner", i + " : " + items.get(i).getName() + " : " + items.get(i).isSelected());
                                     }
@@ -238,24 +210,17 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
                         linear_supervisor.setVisibility(View.GONE);
                     }
                 }
+
             } else {
                 coaching_visit = -1;
                 linear_supervisor.setVisibility(View.GONE);
-                    fab_save.hide();//setVisibility(View.GONE);
+                fab_save.hide(); //setVisibility(View.GONE);
             }
 
-                break;
+        } else if (parent.getId() == R.id.multi_spinner_supervisor) {
-
+            // Commented-out code from original
-            case R.id.multi_spinner_supervisor:
-              /*  if(position!=0){
-                    emp_id = supervisorList.get(position-1).getEMP_ID().get(0);
         }
-                else {
-                    emp_id = "";
-                }*/
 
-                break;
-        }
     }
 
     @Override
@@ -266,18 +231,18 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
     @Override
     public void onClick(View v) {
 
-        switch (v.getId()) {
+        if (v.getId() == R.id.img_cam) {
-            case R.id.img_cam:
+
             _pathforcheck = store_id + "CoachingVisit" + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
             startCameraActivity();
-                break;
 
-            case R.id.fab_save:
+        } else if (v.getId() == R.id.fab_save) {
+
             if (coaching_visit == 1) {
                 String error_msg = "";
                 boolean flag = true;
-                    //if(emp_id.equals("")){
+
                 if (selectedSupervisorList.size() == 0) {
                     flag = false;
                     error_msg = getString(R.string.title_activity_select_dropdown);
@@ -296,13 +261,12 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
                     }
 
                     Toast.makeText(context, getString(R.string.save_message), Toast.LENGTH_SHORT).show();
-
                     saved_flag = true;
-
+                    fab_next.show(); // setVisibility(View.VISIBLE);
-                        fab_next.show();//setVisibility(View.VISIBLE);
                 } else {
                     Snackbar.make(linear_supervisor, error_msg, Snackbar.LENGTH_SHORT).show();
                 }
+
             } else {
                 CoachingVisitGetterSetter coachingVisitGetterSetter = new CoachingVisitGetterSetter();
                 coachingVisitGetterSetter.setEmp_id("0");
@@ -313,28 +277,23 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
                 Toast.makeText(context, getString(R.string.save_message), Toast.LENGTH_SHORT).show();
                 saved_flag = true;
-                    fab_next.show();//setVisibility(View.VISIBLE);
+                fab_next.show(); // setVisibility(View.VISIBLE);
             }
 
-
+        } else if (v.getId() == R.id.fab) {
-                break;
-
-            case R.id.fab:
-
             if (saved_flag || update_flag) {
-
-                   // Intent i = new Intent(CoachingVisitActivity.this, StoreCheckoutImageActivity.class);
                 Intent i = new Intent(CoachingVisitActivity.this, CoachingVisitStoreActivity.class);
                 i.putExtra(CommonString.KEY_STORE_ID, store_id);
                 i.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
                 startActivity(i);
                 finish();
                 overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+
             } else {
                 Snackbar.make(linear_supervisor, getString(R.string.please_save_data), Snackbar.LENGTH_SHORT).show();
             }
-                break;
         }
+
     }
 
     String getEmp_idFromName(String name) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java

@@ -168,25 +168,20 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
-        switch (parent.getId()) {
+        if (parent.getId() == R.id.spinner_coaching_visit) {
-            case R.id.spinner_coaching_visit:
+
             if (position != 0) {
 
                 if (!update_flag) {
 
-                        fab_save.show();//setVisibility(View.VISIBLE);
+                    fab_save.show(); // setVisibility(View.VISIBLE);
 
                     if (position == 1) {
 
                         linear_supervisor.setVisibility(View.VISIBLE);
-
                         coaching_visit = 1;
 
-                            /**
+                        // Creating list for multi-spinner
-                             * Getting array of String to Bind in Spinner
-                             */
-                            //final List<String> list = Arrays.asList(getResources().getStringArray(R.array.sports_array));
-
                         final List<KeyPairBoolData> listArray0 = new ArrayList<>();
 
                         for (int i = 0; i < supervisorList.size(); i++) {
@@ -198,15 +193,11 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
                         }
 
                         multi_spinner_supervisor.setItems(listArray0, -1, new SpinnerListener() {
-
                             @Override
                             public void onItemsSelected(List<KeyPairBoolData> items) {
-
                                 selectedSupervisorList.clear();
-
                                 for (int i = 0; i < items.size(); i++) {
                                     if (items.get(i).isSelected()) {
-
                                         selectedSupervisorList.add(items.get(i).getName());
                                         Log.i("MultiSpinner", i + " : " + items.get(i).getName() + " : " + items.get(i).isSelected());
                                     }
@@ -222,25 +213,13 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
                 }
 
             } else {
-
                 coaching_visit = -1;
                 linear_supervisor.setVisibility(View.GONE);
-                    fab_save.hide();//setVisibility(View.GONE);
+                fab_save.hide(); // setVisibility(View.GONE);
             }
 
-                break;
-
-            case R.id.multi_spinner_supervisor:
-
-              /*  if(position!=0){
-                    emp_id = supervisorList.get(position-1).getEMP_ID().get(0);
         }
-                else {
-                    emp_id = "";
-                }*/
 
-                break;
-        }
     }
 
     @Override
@@ -251,22 +230,21 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
     @Override
     public void onClick(View v) {
 
-        switch (v.getId()) {
+        if (v.getId() == R.id.img_cam) {
-            case R.id.img_cam:
+
-                _pathforcheck = store_id + "CheckVisit" + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+            _pathforcheck = store_id + "CheckVisit" + visit_date.replace("/", "") +
+                    CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
 
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
 
             startCameraActivity();
-                break;
 
-            case R.id.fab_save:
+        } else if (v.getId() == R.id.fab_save) {
 
             if (coaching_visit == 1) {
-
                 String error_msg = "";
                 boolean flag = true;
-                    //if(emp_id.equals("")){
+
                 if (selectedSupervisorList.size() == 0) {
                     flag = false;
                     error_msg = getString(R.string.title_activity_select_dropdown);
@@ -276,7 +254,6 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
                 }
 
                 if (flag) {
-
                     for (int i = 0; i < selectedSupervisorList.size(); i++) {
                         CoachingVisitGetterSetter coachingVisitGetterSetter = new CoachingVisitGetterSetter();
                         coachingVisitGetterSetter.setEmp_id(getEmp_idFromName(selectedSupervisorList.get(i)));
@@ -287,13 +264,13 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
                     }
 
                     Toast.makeText(context, getString(R.string.save_message), Toast.LENGTH_SHORT).show();
-
                     saved_flag = true;
+                    fab_next.show(); // setVisibility(View.VISIBLE);
 
-                        fab_next.show();//setVisibility(View.VISIBLE);
                 } else {
                     Snackbar.make(linear_supervisor, error_msg, Snackbar.LENGTH_SHORT).show();
                 }
+
             } else {
                 CoachingVisitGetterSetter coachingVisitGetterSetter = new CoachingVisitGetterSetter();
                 coachingVisitGetterSetter.setEmp_id("0");
@@ -304,13 +281,10 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
 
                 Toast.makeText(context, getString(R.string.save_message), Toast.LENGTH_SHORT).show();
                 saved_flag = true;
-                    fab_next.show();//setVisibility(View.VISIBLE);
+                fab_next.show(); // setVisibility(View.VISIBLE);
             }
 
-
+        } else if (v.getId() == R.id.fab) {
-                break;
-
-            case R.id.fab:
 
             if (saved_flag || update_flag) {
 
@@ -320,11 +294,12 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada
                 startActivity(i);
                 finish();
                 overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+
             } else {
                 Snackbar.make(linear_supervisor, getString(R.string.please_save_data), Snackbar.LENGTH_SHORT).show();
             }
-                break;
         }
+
     }
 
     String getEmp_idFromName(String name) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java

@@ -204,8 +204,7 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
     public void onClick(View v) {
         int id = v.getId();
 
-        switch (id) {
+        if (id == R.id.btntoggle) {
-            case R.id.btntoggle:
             isExists = btntoggle.isChecked();
 
             if (isExists) {
@@ -242,16 +241,14 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                         .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                    //checkBox.setChecked(true);
                                 btntoggle.setChecked(true);
                             }
                         });
                 android.app.AlertDialog alert = builder.create();
                 alert.show();
             }
-                break;
 
-            case R.id.fab_add:
+        } else if (id == R.id.fab_add) {
 
             skuName = et_sku_name.getText().toString().replaceAll("[&^<>{}'$]", "").replaceFirst("^0+(?!$)", "");
 
@@ -259,13 +256,11 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                 Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_promo_type, Snackbar.LENGTH_SHORT).show();
             } else if (subcategory.equals("")) {
                 Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_sub_category, Snackbar.LENGTH_SHORT).show();
-                }else if (brand.equals("")) {
+            } else if (brand.equals("")) {
                 Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_competitor, Snackbar.LENGTH_SHORT).show();
             } else if (skuName.equals("")) {
                 Snackbar.make(rec_added_counterfeit_product, R.string.pls_enter_comment, Snackbar.LENGTH_SHORT).show();
-                } /*else  if (img_str.equals("") && img_str1.equals("") && img_str2.equals("")) {
+            } else {
-                    Snackbar.make(rec_added_counterfeit_product, R.string.click_image, Snackbar.LENGTH_SHORT).show();
-                }*/ else {
                 CompetitonPromoGetterSetter product = new CompetitonPromoGetterSetter();
                 product.setBrand(brand);
                 product.setPromotion(promotion);
@@ -296,7 +291,6 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                 sp_subcategory.setSelection(0);
                 spinner_brand_list.setSelection(0);
                 sp_promotion_typ.setSelection(0);
-                    //clearBrandSpinner();
 
                 imgCam.setBackgroundResource(R.mipmap.camera_orange);
                 imgCam1.setBackgroundResource(R.mipmap.camera_orange);
@@ -305,39 +299,33 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                 isdata_added = true;
             }
 
-                break;
+        } else if (id == R.id.fab) {
 
-            case R.id.fab:
+            if (isExists && addedCounterfeitProducts.size() == 0) {
-                if(isExists && addedCounterfeitProducts.size()==0){
+                Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
-                    Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add,Snackbar.LENGTH_SHORT).show();
+            } else {
-                }
-                else {
                 db.InsertComptionPromotData(addedCounterfeitProducts, categoryId, store_id, isExists);
                 finish();
                 overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
             }
 
-                break;
+        } else if (id == R.id.img_cam) {
-
-            case R.id.img_cam:
             _pathforcheck = store_id + "CounterfeitProductImg1" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
             startCameraActivity();
-                break;
 
-            case R.id.img_cam1:
+        } else if (id == R.id.img_cam1) {
             _pathforcheck1 = store_id + "CounterfeitProductImg2" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck1;
             startCameraActivity();
-                break;
 
-            case R.id.img_cam2:
+        } else if (id == R.id.img_cam2) {
             _pathforcheck2 = store_id + "CounterfeitProductImg3" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck2;
             startCameraActivity();
-                break;
         }
 
+
     }
 
     void clearBrandSpinner() {
@@ -355,20 +343,23 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
     }
 
     @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long _po) {
-        switch (parent.getId()) {
+        int id = parent.getId();
-            case R.id.sp_subcategory:
+
+        if (id == R.id.sp_subcategory) {
             if (position != 0) {
                 subcategory = subcategory_list.get(position).getSUB_CATEGORY().get(0);
                 subcategoryId = Integer.parseInt(subcategory_list.get(position).getSUB_CATEGORY_ID().get(0));
 
-                    brand_list = db.getCompetionData(keyAccount_id, storeType_id,class_id,categoryId,subcategoryId);
+                brand_list = db.getCompetionData(keyAccount_id, storeType_id, class_id, categoryId, subcategoryId);
-                    //brand data
+
+                // Prepare brand data with default "Select" option
                 BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter();
                 String select = getResources().getString(R.string.select);
                 brand_select.setBRAND(select);
                 brand_select.setBRAND_ID("0");
                 brand_list.add(0, brand_select);
+
                 CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list);
                 spinner_brand_list.setAdapter(adapter);
                 spinner_brand_list.setOnItemSelectedListener(this);
@@ -379,10 +370,7 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                 subcategoryId = 0;
                 lay_competitor_name.setVisibility(View.GONE);
             }
-                break;
+        } else if (id == R.id.sp_brand) {
-
-                case R.id.sp_brand:
-
             if (position != 0) {
                 brand = brand_list.get(position).getBRAND().get(0);
                 brand_id = Integer.parseInt(brand_list.get(position).getBRAND_ID().get(0));
@@ -390,23 +378,16 @@ public class CompetitionPromoActivity extends AppCompatActivity implements Adapt
                 brand = "";
                 brand_id = 0;
             }
-
+        } else if (id == R.id.sp_promotion_typ) {
-                break;
-            case R.id.sp_promotion_typ:
-
             if (position != 0) {
                 promotion = promotion_list.get(position).getPROMOTION_TYPE().get(0);
                 promotion_id = Integer.parseInt(promotion_list.get(position).getPROMOTION_TYPE_ID().get(0));
             } else {
                 promotion = "";
                 promotion_id = 0;
-
+            }
         }
 
-                break;
-
-
-        }
 
     }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java

@@ -168,8 +168,7 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
     public void onClick(View v) {
         int id = v.getId();
 
-        switch (id) {
+        if (id == R.id.btntoggle) {
-            case R.id.btntoggle:
             isExists = btntoggle.isChecked();
 
             if (isExists) {
@@ -211,10 +210,8 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
                 android.app.AlertDialog alert = builder.create();
                 alert.show();
             }
-                break;
-
-            case R.id.fab_add:
 
+        } else if (id == R.id.fab_add) {
             skuName = et_sku_name.getText().toString().replaceAll("[&^<>{}'$]", "").replaceFirst("^0+(?!$)", "");
             stock = et_stock.getText().toString();
 
@@ -254,7 +251,6 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
                 et_stock.setText("");
                 et_sku_name.setText("");
                 spinner_brand_list.setSelection(0);
-                    //clearBrandSpinner();
 
                 imgCam.setBackgroundResource(R.mipmap.camera_orange);
                 imgCam1.setBackgroundResource(R.mipmap.camera_orange);
@@ -263,39 +259,35 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
                 isdata_added = true;
             }
 
-                break;
+        } else if (id == R.id.fab) {
-
+            if (isExists && addedCounterfeitProducts.size() == 0) {
-            case R.id.fab:
+                Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
-                if(isExists && addedCounterfeitProducts.size()==0){
+            } else {
-                    Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add,Snackbar.LENGTH_SHORT).show();
-                }
-                else {
                 db.InsertCounterfeitProductData(addedCounterfeitProducts, categoryId, store_id, isExists);
                 finish();
                 overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
             }
 
-                break;
+        } else if (id == R.id.img_cam) {
-
+            _pathforcheck = store_id + "CounterfeitProductImg1" + categoryId + visit_date.replace("/", "") +
-            case R.id.img_cam:
+                    CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-                _pathforcheck = store_id + "CounterfeitProductImg1" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
             startCameraActivity();
-                break;
 
-            case R.id.img_cam1:
+        } else if (id == R.id.img_cam1) {
-                _pathforcheck1 = store_id + "CounterfeitProductImg2" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+            _pathforcheck1 = store_id + "CounterfeitProductImg2" + categoryId + visit_date.replace("/", "") +
+                    CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck1;
             startCameraActivity();
-                break;
 
-            case R.id.img_cam2:
+        } else if (id == R.id.img_cam2) {
-                _pathforcheck2 = store_id + "CounterfeitProductImg3" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+            _pathforcheck2 = store_id + "CounterfeitProductImg3" + categoryId + visit_date.replace("/", "") +
+                    CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
             _path = CommonString.getImagesFolder(context) + _pathforcheck2;
             startCameraActivity();
-                break;
         }
 
+
     }
 
     void clearBrandSpinner() {
@@ -314,9 +306,7 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        switch (parent.getId()) {
+        if (parent.getId() == R.id.sp_brand) {
-            case R.id.sp_brand:
-
             if (position != 0) {
                 brand = brand_list.get(position).getBRAND().get(0);
                 brand_id = Integer.parseInt(brand_list.get(position).getBRAND_ID().get(0));
@@ -324,10 +314,9 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
                 brand = "";
                 brand_id = 0;
             }
-
-                break;
         }
 
+
     }
 
     @Override

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java

@@ -91,27 +91,18 @@ public class DeliveryCallActivity extends AppCompatActivity implements View.OnCl
 
         int id = v.getId();
 
-        switch (id) {
+        if (id == R.id.fab_upload) {
-
-            case R.id.fab_upload:
-
             new UploadTask().execute();
-                break;
+        } else if (id == R.id.fab) {
-
-            case R.id.fab:
-
             if (isCheckedIn()) {
                 Snackbar.make(recyclerView, getString(R.string.title_store_list_checkout_current), Snackbar.LENGTH_SHORT).show();
             } else {
-
                 Intent in = new Intent(context, DeliveryCallAddStoreActivity.class);
                 startActivity(in);
-
                 overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
             }
-
-                break;
         }
+
     }
 
     class DeliveryAdapter extends RecyclerView.Adapter<DeliveryAdapter.MyViewHolder> {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java

@@ -315,8 +315,9 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
+        int viewId = v.getId();
-            case R.id.img_checkin:
+
+        if (viewId == R.id.img_checkin) {
 
             in_time = CommonFunctions.getCurrentTimeWithLanguage(context);
 
@@ -325,9 +326,8 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
 
             startCameraActivity(0);
-                break;
 
-            case R.id.img_checkout:
+        } else if (viewId == R.id.img_checkout) {
 
             out_time = CommonFunctions.getCurrentTimeWithLanguage(context);
 
@@ -336,8 +336,9 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
 
             startCameraActivity(1);
-                break;
+
         }
+
     }
 
     protected void startCameraActivity(int request_code) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java

@@ -80,20 +80,21 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
+        int viewId = v.getId();
-            case R.id.iconCalender:
+
+        if (viewId == R.id.iconCalender) {
             c = Calendar.getInstance();
             year = c.get(Calendar.YEAR);
             month = c.get(Calendar.MONTH);
             day = c.get(Calendar.DAY_OF_MONTH);
             showDatePickerDialog(year, month, day);
-                break;
+
-            case R.id.fab:
+        } else if (viewId == R.id.fab) {
             Snackbar.make(v, "Replace with your own action", Snackbar.LENGTH_LONG)
                     .setAction("Action", null).show();
-                break;
         }
 
+
     }
 
     protected void showDatePickerDialog(int year, int month, int day) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java

@@ -211,9 +211,8 @@ public class NonWorkingReason extends AppCompatActivity implements
     @Override
     public void onBackPressed() {
         // TODO Auto-generated method stub
-
+        super.onBackPressed();
         finish();
-
         overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
     }
 
@@ -222,8 +221,9 @@ public class NonWorkingReason extends AppCompatActivity implements
                                long arg3) {
         // TODO Auto-generated method stub
 
-        switch (arg0.getId()) {
+        int id = arg0.getId();
-            case R.id.spinner_reason:
+
+        if (id == R.id.spinner_reason) {
             if (position != 0) {
                 reasonname = reasondata.get(position - 1).getREASON().get(0);
                 reasonid = reasondata.get(position - 1).getREASON_ID().get(0);
@@ -240,14 +240,13 @@ public class NonWorkingReason extends AppCompatActivity implements
                     rel_cam.setVisibility(View.GONE);
                     image = "false";
                 }
-                    //reason_reamrk = "true";
+
                 if (remark_allow.equalsIgnoreCase("1")) {
                     reason_lay.setVisibility(View.VISIBLE);
-                        if(remark_type.equalsIgnoreCase("Text")){
+                    if (remark_type.equalsIgnoreCase("Text")) {
                         text.setVisibility(View.VISIBLE);
                         subreason_spinner.setVisibility(View.GONE);
-                        }
+                    } else {
-                        else {
                         text.setVisibility(View.GONE);
                         subreason_spinner.setVisibility(View.VISIBLE);
 
@@ -256,7 +255,7 @@ public class NonWorkingReason extends AppCompatActivity implements
                         sub_reason_adapter = new ArrayAdapter<CharSequence>(this,
                                 android.R.layout.simple_spinner_item);
 
-                            String select_str = getResources().getString(R.string.select_promo) + " " +reasondata.get(position - 1).getREMARK_LABEL().get(0);
+                        String select_str = getResources().getString(R.string.select_promo) + " " + reasondata.get(position - 1).getREMARK_LABEL().get(0);
 
                         sub_reason_adapter.add(select_str);
 
@@ -266,8 +265,7 @@ public class NonWorkingReason extends AppCompatActivity implements
 
                         subreason_spinner.setAdapter(sub_reason_adapter);
 
-                            sub_reason_adapter
+                        sub_reason_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                                    .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 
                         subreason_spinner.setOnItemSelectedListener(this);
                     }
@@ -280,19 +278,15 @@ public class NonWorkingReason extends AppCompatActivity implements
                 reasonid = "";
                 reason_lay.setVisibility(View.GONE);
             }
-                break;
+        } else if (id == R.id.spinner_sub_reason) {
-
-            case R.id.spinner_sub_reason:
-
             if (position != 0) {
-                    sub_reason_id = sub_reasondata.get(position-1).getSUB_REASON_ID().get(0);
+                sub_reason_id = sub_reasondata.get(position - 1).getSUB_REASON_ID().get(0);
-                }
+            } else {
-                else {
                 sub_reason_id = "";
             }
-                break;
         }
 
+
     }
 
     @Override

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PDimageActivity.kt

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
@@ -18,6 +17,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -41,7 +41,6 @@ import kotlinx.coroutines.launch
 import org.json.JSONObject
 import java.io.File
 
-
 class PDimageActivity : AppCompatActivity() {
     private var context: Context? = null
     var categoryName: String? = null
@@ -96,7 +95,17 @@ class PDimageActivity : AppCompatActivity() {
             setDisplayHomeAsUpEnabled(true)
             title = kpi_name
         }
-        CommonUtils.initializePDSDK(this@PDimageActivity, _userId = username)
+        preferences?.getString(CommonString.KEY_PD_PROJECT_Id, "")?.let { projectId ->
+            val userId = preferences?.getString(CommonString.KEY_PD_USER_Id, "")
+                .takeIf { !it.isNullOrBlank() } ?: username
+
+            CommonUtils.initializePDSDK(
+                this@PDimageActivity,
+                projectId = projectId,
+                _userId = userId
+            )
+        }
+
         registerIntentFilter(
             listOf(
                 "DataSaved", "did-receive-queue-data", "did-receive-image-upload-status"
@@ -111,7 +120,13 @@ class PDimageActivity : AppCompatActivity() {
                         .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
                             // Handle Yes button click
                             db?.open()
-                            db?.InsertPdImageData(date, store_id, categoryId, listdat,CommonString.KEY_COMPELETE)?.let {
+                            db?.InsertPdImageData(
+                                date,
+                                store_id,
+                                categoryId,
+                                listdat,
+                                CommonString.KEY_COMPELETE
+                            )?.let {
                                 if (it > 0) {
                                     Snackbar.make(
                                         binding.fab,
@@ -144,7 +159,6 @@ class PDimageActivity : AppCompatActivity() {
         checkAndRequestPermissions()
     }
 
-
     override fun onResume() {
         super.onResume()
         db?.open()
@@ -228,10 +242,10 @@ class PDimageActivity : AppCompatActivity() {
                                     item.uri
                                 ).getName()
                             savedImages.add(ImageUri(uri = item.uri, modify_uri = setName))
-                            savefile(Uri.parse(item.uri), "$dir $setName")
+                            savefile(item.uri.toUri(), "$dir $setName")
                         }
                         adapter?.updateItem(position = _pos, savedImages)
-                        Log.e("savedImages",savedImages.toString())
+                        Log.e("savedImages", savedImages.toString())
                         _pos = -1
                     }
                 }
@@ -266,7 +280,7 @@ class PDimageActivity : AppCompatActivity() {
         uploadParams.put("shop_id", store_id)
         uploadParams.put("user_id", username)
         uploadParams.put("category_id", subCat_code)
-        uploadParams.put("project_id", CommonString.PD_PROJECT_iD)
+        uploadParams.put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))
 
         CameraSDK.startCamera(
             context = this,
@@ -324,7 +338,8 @@ class PDimageActivity : AppCompatActivity() {
         }
 
         Log.d("listdatsize", listdat?.size.toString())
-        adapter = SubCatPdAdapter(category = categoryName,
+        adapter = SubCatPdAdapter(
+            category = categoryName,
             context = this,
             subcates = ArrayList(),
             btnlistener = object : SubCatPdAdapter.BtnClickListener {
@@ -343,8 +358,8 @@ class PDimageActivity : AppCompatActivity() {
     override fun onPause() {
         super.onPause()
         db?.open()
-        if (!db!!.isSOSCategory(store_id, date, CommonString.KEY_COMPELETE,categoryId)) {
+        if (!db!!.isSOSCategory(store_id, date, CommonString.KEY_COMPELETE, categoryId)) {
-            db?.InsertPdImageData(date, store_id, categoryId,listdat,CommonString.KEY_DRAFT)
+            db?.InsertPdImageData(date, store_id, categoryId, listdat, CommonString.KEY_DRAFT)
         }
     }
 
@@ -419,7 +434,7 @@ class PDimageActivity : AppCompatActivity() {
                     ) {
                         showDialogOK(
                             "Photos or media Service Permission required for this app"
-                        ) { dialog: DialogInterface?, which: Int ->
+                        ) { _: DialogInterface?, which: Int ->
                             when (which) {
                                 DialogInterface.BUTTON_POSITIVE -> checkAndRequestPermissions()
                                 DialogInterface.BUTTON_NEGATIVE -> {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java

@@ -185,15 +185,16 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
+        if (id == R.id.img_cam_selfie) {
-            case R.id.img_cam_selfie:
+            _pathforcheck = checkOutStore_id + "CHK_SI_"
-                _pathforcheck = checkOutStore_id + "CHK_SI_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+                    + visit_date.replace("/", "") + "_"
+                    + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+
             _path = CommonString.getImagesFolder(context) + _pathforcheck;
             intime = CommonFunctions.getCurrentTimeWithLanguage(context);
             startCameraActivity();
-                break;
 
-            case R.id.btn_save_selfie:
+        } else if (id == R.id.btn_save_selfie) {
             if (img_str != null) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(StoreCheckoutImageActivity.this);
                 builder.setMessage(getResources().getString(R.string.title_activity_save_data))
@@ -208,16 +209,17 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
                             i.putExtra(CommonString.KEY_LONGITUDE, lon);
                             startActivity(i);
                             finish();
-                            }).setNegativeButton(getResources().getString(R.string.cancel), (dialog, id12) -> dialog.cancel());
+                        })
+                        .setNegativeButton(getResources().getString(R.string.cancel), (dialog, id12) -> dialog.cancel());
 
                 alert = builder.create();
                 alert.show();
+
             } else {
                 Toast.makeText(context, getResources().getString(R.string.clickimage), Toast.LENGTH_SHORT).show();
             }
-
-                break;
         }
+
     }
 
     protected void startCameraActivity() {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java

@@ -299,7 +299,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
                     if (uris != null && !uris.isEmpty()) {
                         for (int k = 0; k < uris.size(); k++) {
                             CommonUtils.INSTANCE.deleteSpecificImage(this,uris.get(k).getUri());
-                          //  CommonUtils.INSTANCE. deleteImage(this,uris.get(k).getUri());
                         }
                     }
                 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java

@@ -481,9 +481,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
         int id = v.getId();
 
-        switch (id) {
+        if (id == R.id.img_cam_selfie) {
-
-            case R.id.img_cam_selfie:
 
             _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
 
@@ -493,9 +491,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
             startCameraActivity();
 
-                break;
+        } else if (id == R.id.btn_save_selfie) {
 
-            case R.id.btn_save_selfie:
             if (img_str != null) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this);
                 builder.setMessage(getResources().getString(R.string.title_activity_save_data))
@@ -504,9 +501,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                             public void onClick(DialogInterface dialog, int id) {
                                 alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
                                 String status;
-//if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")
+
-//                                            || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) {
+                                if (store_flag_str.equals(CommonString.FROM_JCP)
-                                    if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase("15")
+                                        || country_id.equalsIgnoreCase("5")
+                                        || country_id.equalsIgnoreCase("15")
                                         || store_flag_str.equals(CommonString.FROM_PHARMA)) {
                                     status = CommonString.KEY_INVALID;
                                 } else {
@@ -519,8 +517,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                                     } else {
                                         status = CommonString.KEY_VALID;
                                     }
-
                                 }
+
                                 CoverageBean cdata = new CoverageBean();
                                 cdata.setStoreId(store_id);
                                 cdata.setVisitDate(visit_date);
@@ -549,6 +547,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
                                 database.open();
                                 database.InsertCoverageData(cdata);
+
                                 String table;
                                 if (store_flag_str.equals(CommonString.FROM_JCP)) {
                                     table = CommonString.KEY_JOURNEY_PLAN;
@@ -564,17 +563,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
                                 database.updateCheckoutStatus(store_id, status, table);
 
-                                           /* SharedPreferences.Editor editor = preferences.edit();
-
-                                            editor.putString(CommonString.KEY_STOREVISITED_STATUS, "");
-                                            editor.putString(CommonString.KEY_STORE_IN_TIME, "");
-
-                                            editor.commit();*/
-
-
-                                    //Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class);
                                 new GeoTagUpload(StoreimageActivity.this).execute();
-
                             }
                         })
                         .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
@@ -589,8 +578,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
             } else {
                 Toast.makeText(context, getResources().getString(R.string.clickimage), Toast.LENGTH_SHORT).show();
             }
-                break;
         }
+
     }
 
     protected void startCameraActivity() {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java

@@ -14,9 +14,6 @@ import android.util.Log;
 import android.view.Window;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
-//import com.crashlytics.android.Crashlytics;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java

@@ -158,11 +158,9 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
     public void onClick(View view) {
         int id = view.getId();
 
-        switch (id) {
+        if (id == R.id.btn_language_one) {
-            case R.id.btn_language_one:
-
             //selected_flag = true;
-                onButtonPressed(language.get(0),culture_id.get(0),login_data.getNOTICE_URL().get(0));
+            onButtonPressed(language.get(0), culture_id.get(0), login_data.getNOTICE_URL().get(0));
 
             CommonFunctions.updateLangResources(getActivity(), language.get(0));
 
@@ -176,12 +174,9 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
             editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0));
             editor.commit();
 
-                break;
+        } else if (id == R.id.btn_language_two) {
-
-            case R.id.btn_language_two:
-
             //selected_flag = true;
-                onButtonPressed(language.get(1),culture_id.get(1),login_data.getNOTICE_URL().get(1));
+            onButtonPressed(language.get(1), culture_id.get(1), login_data.getNOTICE_URL().get(1));
 
             CommonFunctions.updateLangResources(getActivity(), language.get(1));
 
@@ -194,9 +189,8 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
             editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1));
             editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(1));
             editor.commit();
-
-                break;
         }
+
     }
 
     /**

GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java

@@ -138,8 +138,7 @@ public class ChangePasswordActivity extends AppCompatActivity implements View.On
     public void onClick(View v) {
         int id = v.getId();
 
-        switch (id){
+        if (id == R.id.img_info) {
-            case R.id.img_info:
 
             Dialog dialog = new Dialog(ChangePasswordActivity.this);
             dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -147,16 +146,14 @@ public class ChangePasswordActivity extends AppCompatActivity implements View.On
             dialog.setContentView(R.layout.password_rule_dialog);
             dialog.show();
 
-                break;
+        } else if (id == R.id.btn_submit) {
 
-            case R.id.btn_submit:
+            if (isValid()) {
-
+                // your code here
-                if(isValid()){
+            }
 
         }
 
-                break;
-        }
     }
 
     boolean isValid(){

GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java

@@ -76,14 +76,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cpm.com.gskmtorange.GetterSetter.PD_CONFIGURATION;
 import cpm.com.gskmtorange.LoginActivity;
 import cpm.com.gskmtorange.MainActivity;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.autoupdate.AutoUpdateActivity;
 import cpm.com.gskmtorange.blurlockview.BlurLockView;
-import cpm.com.gskmtorange.blurlockview.Directions.HideType;
-import cpm.com.gskmtorange.blurlockview.Directions.ShowType;
-import cpm.com.gskmtorange.blurlockview.Eases.EaseType;
 import cpm.com.gskmtorange.blurlockview.Password;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
@@ -92,7 +90,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
 import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
 
-public class MPinActivity extends AppCompatActivity implements View.OnClickListener, BlurLockView.OnPasswordInputListener, BlurLockView.OnLeftButtonClickListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
+public class MPinActivity extends AppCompatActivity implements BlurLockView.OnPasswordInputListener, BlurLockView.OnLeftButtonClickListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
     BlurLockView blurLockView;
     ImageView imageView1;
     String pin = "";
@@ -306,17 +304,11 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
 
         LocationCallback locationCallback = new LocationCallback() {
             @Override
-            public void onLocationResult(LocationResult locationResult) {
+            public void onLocationResult(@NonNull LocationResult locationResult) {
-                if (locationResult != null) {
-                    if (locationResult == null) {
-                        return;
-                    }
                 //Showing the latitude, longitude and accuracy on the home screen.
                 for (Location location : locationResult.getLocations()) {
                     lat = location.getLatitude();
                     lon = location.getLongitude();
-                        // Log.e("latitude_inside",location.getLatitude() + "," +location.getLongitude());
-                    }
                 }
             }
         };
@@ -406,18 +398,6 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
         pin = remainingPassword;
     }
 
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.image_1:
-               /* blurLockView.show(
-                        getIntent().getIntExtra("SHOW_DURATION", 1000),
-                        getShowType(getIntent().getIntExtra("SHOW_DIRECTION", 0)),
-                        getEaseType(getIntent().getIntExtra("SHOW_EASE_TYPE", 30)));
-                blurLockView.setType(Password.TEXT, true);*/
-                break;
-        }
-    }
 
     @Override
     public void onClick() {
@@ -463,153 +443,6 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
 
     }
 
-
-    private int downsamepleFactor;
-
-    private ShowType getShowType(int p) {
-        ShowType showType = ShowType.FROM_TOP_TO_BOTTOM;
-        switch (p) {
-            case 0:
-                showType = ShowType.FROM_TOP_TO_BOTTOM;
-                break;
-            case 1:
-                showType = ShowType.FROM_RIGHT_TO_LEFT;
-                break;
-            case 2:
-                showType = ShowType.FROM_BOTTOM_TO_TOP;
-                break;
-            case 3:
-                showType = ShowType.FROM_LEFT_TO_RIGHT;
-                break;
-            case 4:
-                showType = ShowType.FADE_IN;
-                break;
-        }
-        return showType;
-    }
-
-    private HideType getHideType(int p) {
-        HideType hideType = HideType.FROM_TOP_TO_BOTTOM;
-        switch (p) {
-            case 0:
-                hideType = HideType.FROM_TOP_TO_BOTTOM;
-                break;
-            case 1:
-                hideType = HideType.FROM_RIGHT_TO_LEFT;
-                break;
-            case 2:
-                hideType = HideType.FROM_BOTTOM_TO_TOP;
-                break;
-            case 3:
-                hideType = HideType.FROM_LEFT_TO_RIGHT;
-                break;
-            case 4:
-                hideType = HideType.FADE_OUT;
-                break;
-        }
-        return hideType;
-    }
-
-    private EaseType getEaseType(int p) {
-        EaseType easeType = EaseType.Linear;
-        switch (p) {
-            case 0:
-                easeType = EaseType.EaseInSine;
-                break;
-            case 1:
-                easeType = EaseType.EaseOutSine;
-                break;
-            case 2:
-                easeType = EaseType.EaseInOutSine;
-                break;
-            case 3:
-                easeType = EaseType.EaseInQuad;
-                break;
-            case 4:
-                easeType = EaseType.EaseOutQuad;
-                break;
-            case 5:
-                easeType = EaseType.EaseInOutQuad;
-                break;
-            case 6:
-                easeType = EaseType.EaseInCubic;
-                break;
-            case 7:
-                easeType = EaseType.EaseOutCubic;
-                break;
-            case 8:
-                easeType = EaseType.EaseInOutCubic;
-                break;
-            case 9:
-                easeType = EaseType.EaseInQuart;
-                break;
-            case 10:
-                easeType = EaseType.EaseOutQuart;
-                break;
-            case 11:
-                easeType = EaseType.EaseInOutQuart;
-                break;
-            case 12:
-                easeType = EaseType.EaseInQuint;
-                break;
-            case 13:
-                easeType = EaseType.EaseOutQuint;
-                break;
-            case 14:
-                easeType = EaseType.EaseInOutQuint;
-                break;
-            case 15:
-                easeType = EaseType.EaseInExpo;
-                break;
-            case 16:
-                easeType = EaseType.EaseOutExpo;
-                break;
-            case 17:
-                easeType = EaseType.EaseInOutExpo;
-                break;
-            case 18:
-                easeType = EaseType.EaseInCirc;
-                break;
-            case 19:
-                easeType = EaseType.EaseOutCirc;
-                break;
-            case 20:
-                easeType = EaseType.EaseInOutCirc;
-                break;
-            case 21:
-                easeType = EaseType.EaseInBack;
-                break;
-            case 22:
-                easeType = EaseType.EaseOutBack;
-                break;
-            case 23:
-                easeType = EaseType.EaseInOutBack;
-                break;
-            case 24:
-                easeType = EaseType.EaseInElastic;
-                break;
-            case 25:
-                easeType = EaseType.EaseOutElastic;
-                break;
-            case 26:
-                easeType = EaseType.EaseInOutElastic;
-                break;
-            case 27:
-                easeType = EaseType.EaseInBounce;
-                break;
-            case 28:
-                easeType = EaseType.EaseOutBounce;
-                break;
-            case 29:
-                easeType = EaseType.EaseInOutBounce;
-                break;
-            case 30:
-                easeType = EaseType.Linear;
-                break;
-        }
-        return easeType;
-    }
-
     private class AuthenticateTask extends AsyncTask<Void, Void, String> {
         private Dialog dialog;
 
@@ -639,125 +472,94 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
 
         @Override
         protected String doInBackground(Void... params) {
-
             try {
-
                 versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
-
                 String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]" + userId + "[/USER_ID]" + "[PASSWORD]" + password + "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(context) + "[/IN_TIME]" + "[LATITUDE]" + lat + "[/LATITUDE]" + "[LONGITUDE]" + lon + "[/LONGITUDE]" + "[APP_VERSION]" + app_ver + "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]" + "[NETWORK_STATUS]" + "LoginStatus" + "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
-
                 SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_LOGIN);
                 request.addProperty("onXML", userauth_xml);
-
                 SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
                 envelope.dotNet = true;
                 envelope.setOutputSoapObject(request);
-
                 HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
                 androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN, envelope);
                 Object result = (Object) envelope.getResponse();
 
                 if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
-                    runOnUiThread(new Runnable() {
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_FAILURE));
-                        @Override
-                        public void run() {
-
-                            showAlert(CommonString.MESSAGE_FAILURE);
-                        }
-                    });
-
                 } else if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
-
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_FALSE));
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-
-                            showAlert(CommonString.MESSAGE_FALSE);
-                        }
-                    });
-
                 } else if (result.toString().equalsIgnoreCase(CommonString.KEY_CHANGED)) {
-
+                    runOnUiThread(() -> showAlert(CommonString.MESSAGE_CHANGED));
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-
-                            showAlert(CommonString.MESSAGE_CHANGED);
-                        }
-                    });
-
                 } else {
-
                     XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
                     factory.setNamespaceAware(true);
                     XmlPullParser xpp = factory.newPullParser();
-
                     xpp.setInput(new StringReader(result.toString()));
                     xpp.next();
                     eventType = xpp.getEventType();
                     final FailureGetterSetter failureGetterSetter = XMLHandlers.failureXMLHandler(xpp, eventType);
-
                     if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
-                        runOnUiThread(new Runnable() {
+                        runOnUiThread(() -> {
-
-                            @Override
-                            public void run() {
                             // TODO Auto-generated method stub
                             showAlert(CommonString.METHOD_LOGIN + failureGetterSetter.getErrorMsg());
-                            }
                         });
                     } else {
 
                         try {
                             // For String source
-
                             xpp.setInput(new StringReader(result.toString()));
                             xpp.next();
                             eventType = xpp.getEventType();
                             lgs = XMLHandlers.loginXMLHandler(xpp, eventType);
-
+                            //PD_CONFIGURATION
-                        } catch (XmlPullParserException e) {
+                            request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
-                            e.printStackTrace();
+                            request.addProperty("UserName", userId);
-                        } catch (IOException e) {
+                            request.addProperty("Type", "PD_CONFIGURATION");
-                            e.printStackTrace();
+                            request.addProperty("cultureid", "1");
+                            envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                            envelope.dotNet = true;
+                            envelope.setOutputSoapObject(request);
+                            androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                            androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+                            result = envelope.getResponse();
+                            xpp.setInput(new StringReader(result.toString()));
+                            xpp.next();
+                            eventType = xpp.getEventType();
+                            PD_CONFIGURATION pdConfiguration = XMLHandlers.PDConfigXMLHandler(xpp);
+                            Log.e("PD_CONFIGURATION_RESULT", result.toString());
+                            // PUT IN PREFERENCES
+                            if (pdConfiguration.getPROJECT_ID() != null && !pdConfiguration.getPROJECT_ID().isEmpty()) {
+                                editor.putString(CommonString.KEY_PD_PROJECT_Id, pdConfiguration.getPROJECT_ID().get(0));
+                                editor.putString(CommonString.KEY_PD_USER_Id, pdConfiguration.getUSER_ID().get(0));
+                            } else {
+                                return CommonString.KEY_FAILURE;
                             }
 
+                        } catch (XmlPullParserException | IOException e) {
+                            e.fillInStackTrace();
+                        }
                         // PUT IN PREFERENCES
                         editor.putString(CommonString.KEY_USERNAME, userId);
                         editor.putString(CommonString.KEY_PASSWORD, password);
                         editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
                         editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
                         editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
-                        //editor.putString(CommonString.KEY_DATE, "01/25/2019");
                         editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
                         editor.commit();
                         setDataFromSharedPreferences(lgs);
-
                         Bundle bundle = new Bundle();
                         bundle.putString(FirebaseAnalytics.Param.ITEM_ID, userId);
                         bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, CommonString.KEY_LOGIN_DATA);
                         bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "Data");
                         bundle.putString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, ""));
                         return CommonString.KEY_SUCCESS;
-
                     }
                 }
 
                 return "";
 
             } catch (MalformedURLException e) {
-
+                runOnUiThread(() -> showAlert(CommonString.MESSAGE_EXCEPTION));
-                runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-
-                        showAlert(CommonString.MESSAGE_EXCEPTION);
-                    }
-                });
-
             } catch (IOException e) {
                 counter++;
                 runOnUiThread(() -> {
@@ -780,7 +582,7 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
             if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
-                initializePDSDK(context, userId);
+                initializePDSDK(context, preferences.getString(CommonString.KEY_PD_PROJECT_Id, ""), preferences.getString(CommonString.KEY_PD_USER_Id, "").isEmpty() ? userId : preferences.getString(CommonString.KEY_PD_USER_Id, ""));
                 if (preferences.getString(CommonString.KEY_VERSION, "").equals(Integer.toString(versionCode))) {
                     setLanguageDataFromSharedPreferences();
                     Intent in = new Intent(context, MainActivity.class);
@@ -1039,7 +841,7 @@ public class MPinActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
-    private void initializePDSDK(Context context, String _userId) {
+    private void initializePDSDK(Context context, String projectId, String _userId) {
-        CommonUtils.INSTANCE.initializePDSDK(context, _userId);
+        CommonUtils.INSTANCE.initializePDSDK(context, projectId, _userId);
     }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java

@@ -253,40 +253,35 @@ public class StoreDetailFragment extends Fragment implements View.OnClickListene
     public void onClick(View v) {
 
         int id = v.getId();
-        switch (id) {
+        if (id == R.id.img_camera1) {
-
-            case R.id.img_camera1:
             _pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
                     CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
             path = str + _pathforcheck;
 
             startCameraActivity(1);
-                break;
 
-            case R.id.img_camera2:
+        } else if (id == R.id.img_camera2) {
             _pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
                     CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
             path = str + _pathforcheck;
 
             startCameraActivity(2);
-                break;
 
-            case R.id.img_camera3:
+        } else if (id == R.id.img_camera3) {
             _pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
                     CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
             path = str + _pathforcheck;
 
             startCameraActivity(3);
-                break;
 
-            case R.id.img_camera4:
+        } else if (id == R.id.img_camera4) {
             _pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
                     CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
             path = str + _pathforcheck;
 
             startCameraActivity(4);
-                break;
         }
+
     }
 
     /**

GSKMTOrange/src/main/java/cpm/com/gskmtorange/service/FCMNotificationService.java

@@ -1,5 +1,6 @@
 package cpm.com.gskmtorange.service;
 
+import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -20,9 +21,9 @@ import com.google.firebase.messaging.RemoteMessage;
 import cpm.com.gskmtorange.MainActivity;
 import cpm.com.gskmtorange.R;
 
+@SuppressLint("MissingFirebaseInstanceTokenRefresh")
 public class FCMNotificationService extends FirebaseMessagingService {
-
+    String TAG = "FCM Notification";
-    String TAG ="FCM Notification";
 
     public FCMNotificationService() {
 
@@ -31,23 +32,13 @@ public class FCMNotificationService extends FirebaseMessagingService {
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         // ...
-
         // TODO(developer): Handle FCM messages here.
         // Not getting messages here? See why this may be: https://goo.gl/39bRNJ
         Log.d(TAG, "From: " + remoteMessage.getFrom());
 
         // Check if message contains a data payload.
-        if (remoteMessage.getData().size() > 0) {
+        if (!remoteMessage.getData().isEmpty()) {
             Log.d(TAG, "Message data payload: " + remoteMessage.getData());
-
-            if (/* Check if data needs to be processed by long running job */ true) {
-                // For long-running tasks (10 seconds or more) use Firebase Job Dispatcher.
-               // scheduleJob();
-            } else {
-                // Handle message within 10 seconds
-               // handleNow();
-            }
-
         }
 
         // Check if message contains a notification payload.
@@ -63,23 +54,7 @@ public class FCMNotificationService extends FirebaseMessagingService {
     /**
      * Schedule a job using FirebaseJobDispatcher.
      */
-    private void scheduleJob() {
-        // [START dispatch_job]
-     /*   FirebaseJobDispatcher dispatcher = new FirebaseJobDispatcher(new GooglePlayDriver(this));
-        Job myJob = dispatcher.newJobBuilder()
-                .setService(MyJobService.class)
-                .setTag("my-job-tag")
-                .build();
-        dispatcher.schedule(myJob);*/
-        // [END dispatch_job]
-    }
 
-    /**
-     * Handle time allotted to BroadcastReceivers.
-     */
-    private void handleNow() {
-        Log.d(TAG, "Short lived task is done.");
-    }
 
     /**
      * Create and show a simple notification containing the received FCM message.
@@ -90,10 +65,10 @@ public class FCMNotificationService extends FirebaseMessagingService {
         Intent intent = new Intent(this, MainActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
-                PendingIntent.FLAG_ONE_SHOT);
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
 
         String channelId = getString(R.string.default_notification_channel_id);
-        Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+        Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder =
                 new NotificationCompat.Builder(this, channelId)
                         .setSmallIcon(R.drawable.save_icon)
@@ -114,6 +89,6 @@ public class FCMNotificationService extends FirebaseMessagingService {
             notificationManager.createNotificationChannel(channel);
         }
 
-        notificationManager.notify(0 /* ID of notification */, notificationBuilder.build());
+        notificationManager.notify(0, notificationBuilder.build());
     }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -1,15 +1,9 @@
 package cpm.com.gskmtorange.upload;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
-import android.graphics.RectF;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -18,37 +12,16 @@ import android.view.WindowManager;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-//import com.crashlytics.android.Crashlytics;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import com.google.gson.JsonSyntaxException;
-import com.squareup.okhttp.MultipartBuilder;
-import com.squareup.okhttp.RequestBody;
-
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
 import org.ksoap2.transport.HttpTransportSE;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
 
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
@@ -61,8 +34,6 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
-import cpm.com.gskmtorange.retrofit.PostApiForFile;
-import cpm.com.gskmtorange.retrofit.StringConverterFactory;
 import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
@@ -84,8 +55,6 @@ import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
-import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
-import retrofit.Retrofit;
 
 public class UploadActivity extends AppCompatActivity {
     private Context context;
@@ -187,14 +156,11 @@ public class UploadActivity extends AppCompatActivity {
         protected String doInBackground(Void... params) {
             try {
                 data = new Data();
+                db.open();
                 ArrayList<CoverageBean> adhoc_coverageList = db.getCoverageData(date, CommonString.FROM_DEVIATION);
                 if (adhoc_coverageList.size() > 0) {
                     for (int i = 0; i < adhoc_coverageList.size(); i++) {
-                        String onXML = "[ADHOC_JCP]"
+                        String onXML = "[ADHOC_JCP]" + "[USER_ID]" + userId + "[/USER_ID]" + "[VISIT_DATE]" + adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]" + "[STORE_CD]" + adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]" + "[/ADHOC_JCP]";
-                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                + "[VISIT_DATE]" + adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                + "[STORE_CD]" + adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]"
-                                + "[/ADHOC_JCP]";
 
                         final String adhoc_xml = "[DATA]" + onXML + "[/DATA]";
 
@@ -218,15 +184,11 @@ public class UploadActivity extends AppCompatActivity {
                     }
                 }
 
+                db.open();
                 ArrayList<CoverageBean> additional_adhoc_coverageList = db.getCoverageData(date, CommonString.FROM_ADDITIONAL_ADHOC);
-
                 if (additional_adhoc_coverageList.size() > 0) {
                     for (int i = 0; i < additional_adhoc_coverageList.size(); i++) {
-                        String onXML = "[ADDITIONAL_ADHOC_JCP]"
+                        String onXML = "[ADDITIONAL_ADHOC_JCP]" + "[USER_ID]" + userId + "[/USER_ID]" + "[VISIT_DATE]" + additional_adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]" + "[STORE_CD]" + additional_adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]" + "[/ADDITIONAL_ADHOC_JCP]";
-                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                + "[VISIT_DATE]" + additional_adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                + "[STORE_CD]" + additional_adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]"
-                                + "[/ADDITIONAL_ADHOC_JCP]";
 
                         final String adhoc_xml = "[DATA]" + onXML + "[/DATA]";
                         SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
@@ -249,8 +211,8 @@ public class UploadActivity extends AppCompatActivity {
                     }
                 }
 
+                db.open();
                 coverageList = db.getCoverageData(date, null);
-
                 if (coverageList.size() > 0) {
                     if (coverageList.size() == 1) {
                         factor = 50;
@@ -260,15 +222,10 @@ public class UploadActivity extends AppCompatActivity {
                 }
 
                 for (int i = 0; i < coverageList.size(); i++) {
-
+                    db.open();
                     storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId(), coverageList.get(i).getFlag_from());
                     if (storeData.getSTORE_ID() != null) {
-
+                        if (!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_D) && (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) || !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U) || !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_UN))) {
-                        if (!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_D) && (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) ||
-                                storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
-                                !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U) ||
-                                !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_UN))) {
-
                             String camera_allow = storeData.getCAMERA_ALLOW();
                             String adhoc;
                             if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_DEVIATION)) {
@@ -280,15 +237,12 @@ public class UploadActivity extends AppCompatActivity {
                             String coverage_service, status_service;
 
                             if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL) || coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL_ADHOC)) {
-
                                 status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL;
                                 coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL;
                             } else if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)) {
-
                                 status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_PHARMA;
                                 coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_PHARMA;
                             } else {
-
                                 status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
                                 coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW;
                             }
@@ -298,26 +252,7 @@ public class UploadActivity extends AppCompatActivity {
                                 sub_reason_id = "0";
                             }
 
-                            String onXML = "[DATA]"
+                            String onXML = "[DATA]" + "[USER_DATA]" + "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]" + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]" + "[LATITUDE]" + coverageList.get(i).getLatitude() + "[/LATITUDE]" + "[APP_VERSION]" + app_version + "[/APP_VERSION]" + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]" + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]" + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]" + "[USER_ID]" + userId + "[/USER_ID]" + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]" + "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]" + "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]" + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]" + "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]" + "[ADHOC]" + adhoc + "[/ADHOC]" + "[SUBREASONID]" + sub_reason_id + "[/SUBREASONID]" + "[/USER_DATA]" + "[/DATA]";
-                                    + "[USER_DATA]"
-                                    + "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]"
-                                    + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                    + "[LATITUDE]" + coverageList.get(i).getLatitude() + "[/LATITUDE]"
-                                    + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
-                                    + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
-                                    + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                    + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                    + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
-                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                    + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
-                                    + "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]"
-                                    + "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
-                                    + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
-                                    + "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]"
-                                    + "[ADHOC]" + adhoc + "[/ADHOC]"
-                                    + "[SUBREASONID]" + sub_reason_id + "[/SUBREASONID]"
-                                    + "[/USER_DATA]"
-                                    + "[/DATA]";
 
                             SoapObject request = new SoapObject(CommonString.NAMESPACE, coverage_service);
                             request.addProperty("onXML", onXML);
@@ -336,8 +271,8 @@ public class UploadActivity extends AppCompatActivity {
                             validity = (words[0]);
 
                             if (validity.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+                                db.open();
                                 db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_P);
-
                                 db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P, coverageList.get(i).getFlag_from());
                             } else {
                                 continue;
@@ -360,14 +295,7 @@ public class UploadActivity extends AppCompatActivity {
                                             } else {
                                                 stock = "0";
                                             }
-                                            onXML = "[ST]"
+                                            onXML = "[ST]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]" + "[STK]" + Integer.parseInt(stock) + "[/STK]" + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" + "[/ST]";
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USERID]" + userId + "[/USERID]"
-                                                    + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]"
-                                                    + "[STK]" + Integer.parseInt(stock) + "[/STK]"
-                                                    + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
-                                                    + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" +
-                                                    "[/ST]";
 
                                             mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
                                         }
@@ -413,13 +341,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exist = "0";
                                         }
 
-                                        coaching_xml = "[COACHING_VISIT_DATA]"
+                                        coaching_xml = "[COACHING_VISIT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]" + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]" + "[IS_EXIST]" + exist + "[/IS_EXIST]" + "[/COACHING_VISIT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
-                                                + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
-                                                + "[IS_EXIST]" + exist + "[/IS_EXIST]"
-                                                + "[/COACHING_VISIT_DATA]";
                                         onXml_coaching_data = onXml_coaching_data + coaching_xml;
                                     }
 
@@ -458,13 +380,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exist = "0";
                                         }
 
-                                        coaching_xml = "[CHECK_VISIT_DATA]"
+                                        coaching_xml = "[CHECK_VISIT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]" + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]" + "[IS_EXIST]" + exist + "[/IS_EXIST]" + "[/CHECK_VISIT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
-                                                + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
-                                                + "[IS_EXIST]" + exist + "[/IS_EXIST]"
-                                                + "[/CHECK_VISIT_DATA]";
                                         onXml_coaching_data = onXml_coaching_data + coaching_xml;
                                     }
 
@@ -503,27 +419,13 @@ public class UploadActivity extends AppCompatActivity {
                                 ImageGetterSetter imageGetterSetter = db.getStoreDetailPharmaImageInsertedData(coverageList.get(i).getStoreId());
                                 String image_xml = "";
 
-                                image_xml = "[IMG_L]"
+                                image_xml = "[IMG_L]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[IMG1]" + imageGetterSetter.getImage1() + "[/IMG1]" + "[IMG2]" + imageGetterSetter.getImage2() + "[/IMG2]" + "[IMG3]" + imageGetterSetter.getImage3() + "[/IMG3]" + "[IMG4]" + imageGetterSetter.getImage4() + "[/IMG4]" + "[/IMG_L]";
-                                        + "[MID]" + mid + "[/MID]"
-                                        + "[USERID]" + userId + "[/USERID]"
-                                        + "[IMG1]" + imageGetterSetter.getImage1() + "[/IMG1]"
-                                        + "[IMG2]" + imageGetterSetter.getImage2() + "[/IMG2]"
-                                        + "[IMG3]" + imageGetterSetter.getImage3() + "[/IMG3]"
-                                        + "[IMG4]" + imageGetterSetter.getImage4() + "[/IMG4]" +
-                                        "[/IMG_L]";
                                 ArrayList<MappingPharmaQuestionGetterSetter> pharmaStoreDetail = db.getStoreDetailPharmaAnswerInsertedData(coverageList.get(i).getStoreId(), null);
 
                                 if (pharmaStoreDetail.size() > 0) {
                                     for (int j = 0; j < pharmaStoreDetail.size(); j++) {
 
-                                        onXML = "[ST]"
+                                        onXML = "[ST]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[QID]" + Integer.parseInt(pharmaStoreDetail.get(j).getQUESTION_ID().get(0)) + "[/QID]" + "[BID]" + Integer.parseInt(pharmaStoreDetail.get(j).getBRAND_ID().get(0)) + "[/BID]" + "[SCID]" + Integer.parseInt(pharmaStoreDetail.get(j).getSUB_CATEGORY_ID().get(0)) + "[/SCID]" + "[PRESENT]" + pharmaStoreDetail.get(j).getIsChecked() + "[/PRESENT]" + "[IMG]" + pharmaStoreDetail.get(j).getImgPath() + "[/IMG]" +
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[QID]" + Integer.parseInt(pharmaStoreDetail.get(j).getQUESTION_ID().get(0)) + "[/QID]"
-                                                + "[BID]" + Integer.parseInt(pharmaStoreDetail.get(j).getBRAND_ID().get(0)) + "[/BID]"
-                                                + "[SCID]" + Integer.parseInt(pharmaStoreDetail.get(j).getSUB_CATEGORY_ID().get(0)) + "[/SCID]"
-                                                + "[PRESENT]" + pharmaStoreDetail.get(j).getIsChecked() + "[/PRESENT]"
-                                                + "[IMG]" + pharmaStoreDetail.get(j).getImgPath() + "[/IMG]" +
 
                                                 "[/ST]";
 
@@ -558,21 +460,12 @@ public class UploadActivity extends AppCompatActivity {
 
                                 String pharma_sos_xml = "";
                                 onXML = "";
-
+                                db.open();
                                 ArrayList<PharmaSOSGetterSetter> pharmaSOSList = db.getStoreDetailPharmaForSOSData(coverageList.get(i).getStoreId(), "1");
-
                                 if (pharmaSOSList.size() > 0) {
                                     for (int j = 0; j < pharmaSOSList.size(); j++) {
 
-                                        onXML = "[ST]"
+                                        onXML = "[ST]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[QID]" + Integer.parseInt(pharmaSOSList.get(j).getQUESTION_ID()) + "[/QID]" + "[BID]" + Integer.parseInt(pharmaSOSList.get(j).getBRAND_ID()) + "[/BID]" + "[SCID]" + Integer.parseInt(pharmaSOSList.get(j).getSUB_CATEGORY_ID()) + "[/SCID]" + "[G_FAC]" + pharmaSOSList.get(j).getGskFacing() + "[/G_FAC]" + "[C_FAC]" + pharmaSOSList.get(j).getCompetitorFacing() + "[/C_FAC]" + "[/ST]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[QID]" + Integer.parseInt(pharmaSOSList.get(j).getQUESTION_ID()) + "[/QID]"
-                                                + "[BID]" + Integer.parseInt(pharmaSOSList.get(j).getBRAND_ID()) + "[/BID]"
-                                                + "[SCID]" + Integer.parseInt(pharmaSOSList.get(j).getSUB_CATEGORY_ID()) + "[/SCID]"
-                                                + "[G_FAC]" + pharmaSOSList.get(j).getGskFacing() + "[/G_FAC]"
-                                                + "[C_FAC]" + pharmaSOSList.get(j).getCompetitorFacing() + "[/C_FAC]" +
-                                                "[/ST]";
 
                                         pharma_sos_xml = pharma_sos_xml + onXML;
                                     }
@@ -605,19 +498,13 @@ public class UploadActivity extends AppCompatActivity {
 
                                 String pharma_msl_xml = "";
                                 onXML = "";
-
+                                db.open();
                                 ArrayList<PharmaMSLInsertedGetterSetter> pharmaMSLList = db.getPharmaMSLInsertedData(coverageList.get(i).getStoreId());
 
                                 if (pharmaMSLList.size() > 0) {
                                     for (int j = 0; j < pharmaMSLList.size(); j++) {
 
-                                        onXML = "[ST]"
+                                        onXML = "[ST]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[BID]" + Integer.parseInt(pharmaMSLList.get(j).getBrandId()) + "[/BID]" + "[SKID]" + Integer.parseInt(pharmaMSLList.get(j).getSkuId()) + "[/SKID]" + "[PRESENT]" + pharmaMSLList.get(j).getPresent() + "[/PRESENT]" + "[/ST]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[BID]" + Integer.parseInt(pharmaMSLList.get(j).getBrandId()) + "[/BID]"
-                                                + "[SKID]" + Integer.parseInt(pharmaMSLList.get(j).getSkuId()) + "[/SKID]"
-                                                + "[PRESENT]" + pharmaMSLList.get(j).getPresent() + "[/PRESENT]" +
-                                                "[/ST]";
 
                                         pharma_msl_xml = pharma_msl_xml + onXML;
                                     }
@@ -653,12 +540,7 @@ public class UploadActivity extends AppCompatActivity {
                                 String mslAvailability_stockFacing_xml = "";
                                 onXML = "";
                                 db.open();
-                                msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerDataNew(coverageList.get(i)
+                                msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerDataNew(coverageList.get(i).getStoreId(), coverageList.get(i).getVisitDate(), coverageList.get(i).getKeyAccountId(), coverageList.get(i).getStoreTypeId(), coverageList.get(i).getClassId(), coverageList.get(i).getMappingStk());
-                                                .getStoreId(), coverageList.get(i).getVisitDate(),
-                                        coverageList.get(i).getKeyAccountId(),
-                                        coverageList.get(i).getStoreTypeId(),
-                                        coverageList.get(i).getClassId(),
-                                        coverageList.get(i).getMappingStk());
 
                                 if (msl_availabilityStockFacingList.size() > 0) {
                                     for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
@@ -675,18 +557,11 @@ public class UploadActivity extends AppCompatActivity {
                                             } else {
                                                 pricing = "-1";
                                             }
-                                            onXML = "[ST]"
+                                            onXML = "[ST]" + "[MID]" + mid + "[/MID]"
-                                                    + "[MID]" + mid + "[/MID]"
                                                     //+ "[USERID]" + userId + "[/USERID]"
-                                                    + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+                                                    + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]" + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]" + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]" + "[SK]" + Integer.parseInt(stock) + "[/SK]" + "[PRICING]" + Double.parseDouble(pricing) + "[/PRICING]"
-                                                    + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
-                                                    + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
-                                                    + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
-                                                    + "[SK]" + Integer.parseInt(stock) + "[/SK]"
-                                                    + "[PRICING]" + Double.parseDouble(pricing) + "[/PRICING]"
                                                     // + "[PRICING]" + Integer.parseInt(pricing) + "[/PRICING]"
-                                                    + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
+                                                    + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" + "[/ST]";
-                                                    "[/ST]";
 
                                             mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
                                         }
@@ -722,12 +597,7 @@ public class UploadActivity extends AppCompatActivity {
                                 String msl_availabilityStockEntryXml = "";
                                 onXML = "";
                                 db.open();
-                                msl_availabilityStockFacingList = db.getStock_Entry_UploadServerDataNew(coverageList.get(i)
+                                msl_availabilityStockFacingList = db.getStock_Entry_UploadServerDataNew(coverageList.get(i).getStoreId(), coverageList.get(i).getVisitDate(), coverageList.get(i).getKeyAccountId(), coverageList.get(i).getStoreTypeId(), coverageList.get(i).getClassId(), coverageList.get(i).getMappingStk());
-                                                .getStoreId(), coverageList.get(i).getVisitDate(),
-                                        coverageList.get(i).getKeyAccountId(),
-                                        coverageList.get(i).getStoreTypeId(),
-                                        coverageList.get(i).getClassId(),
-                                        coverageList.get(i).getMappingStk());
 
                                 if (msl_availabilityStockFacingList.size() > 0) {
                                     for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
@@ -743,15 +613,7 @@ public class UploadActivity extends AppCompatActivity {
                                             } else {
                                                 warehouse_stock = "0";
                                             }
-                                            onXML = "[ST]"
+                                            onXML = "[ST]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]" + "[POSM_STOCK]" + Integer.parseInt(posm_stock) + "[/POSM_STOCK]" + "[WAREHOUSE_STOCK]" + Integer.parseInt(warehouse_stock) + "[/WAREHOUSE_STOCK]" + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" + "[/ST]";
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USERID]" + userId + "[/USERID]"
-                                                    + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
-                                                    + "[POSM_STOCK]" + Integer.parseInt(posm_stock) + "[/POSM_STOCK]"
-                                                    + "[WAREHOUSE_STOCK]" + Integer.parseInt(warehouse_stock) + "[/WAREHOUSE_STOCK]"
-                                                    + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
-                                                    + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
-                                                    "[/ST]";
 
                                             msl_availabilityStockEntryXml = msl_availabilityStockEntryXml + onXML;
                                         }
@@ -792,18 +654,9 @@ public class UploadActivity extends AppCompatActivity {
                                     for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
                                         if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
 
-                                            onXML = "[PROMOTION_DATA_NEW]"
+                                            onXML = "[PROMOTION_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                                    + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                    + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
                                                     //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
-                                                    + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
+                                                    + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]" + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]" + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]" + "[/PROMOTION_DATA_NEW]";
-                                                    + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
-                                                    + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
-                                                    + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
-                                                    + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]"
-                                                    + "[/PROMOTION_DATA_NEW]";
 
                                             promoition_data_xml = promoition_data_xml + onXML;
                                         }
@@ -842,7 +695,7 @@ public class UploadActivity extends AppCompatActivity {
                                 if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
 
                                     for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
-
+                                        db.open();
                                         promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
 
                                         for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
@@ -853,18 +706,7 @@ public class UploadActivity extends AppCompatActivity {
                                                     discount_val = "0";
                                                 }
 
-                                                add_xml = "[PROMOTION_DATA]"
+                                                add_xml = "[PROMOTION_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]" + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]" + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]" + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]" + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]" + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]" + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]" + "[/PROMOTION_DATA]";
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                        + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
-                                                        + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
-                                                        + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
-                                                        + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
-                                                        + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
-                                                        + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
-                                                        + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
-                                                        + "[/PROMOTION_DATA]";
                                                 add_promotion_data_xml = add_promotion_data_xml + add_xml;
                                             }
                                         }
@@ -874,13 +716,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exists = 1;
                                         }
 
-                                        exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
+                                        exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]" + "[IS_EXISTS]" + exists + "[/IS_EXISTS]" + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]" + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
-                                                + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
-                                                + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
 
                                         promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
 
@@ -924,18 +760,9 @@ public class UploadActivity extends AppCompatActivity {
                                     for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
                                         if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
 
-                                            onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]"
+                                            onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]" + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                                    + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                    + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
-                                                    + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
                                                     //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
-                                                    + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+                                                    + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]" + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]" + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
-                                                    + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
-                                                    + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
-                                                    + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]"
-                                                    + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
 
                                             additional_promoition_data_xml = additional_promoition_data_xml + onXML;
                                         }
@@ -1006,32 +833,15 @@ public class UploadActivity extends AppCompatActivity {
                                         if (additionalVisibilitySkuList.size() > 0) {
                                             for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
 
-                                                onXMLdIALOG = "[VISIBILITY_DAILOG]"
+                                                onXMLdIALOG = "[VISIBILITY_DAILOG]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]" + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]" + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]" + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]" + "[/VISIBILITY_DAILOG]";
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
-                                                        + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
-                                                        + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
-                                                        + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
-                                                        + "[/VISIBILITY_DAILOG]";
 
                                                 additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
                                             }
                                         }
 
-                                        onXML = "[ADDITIONAL_VISIBILITY_NEW]"
+                                        onXML = "[ADDITIONAL_VISIBILITY_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]" + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]" + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
-                                                + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
-                                                + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
                                                 //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"
-                                                + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
+                                                + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]" + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]" + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]" + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]" + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]" + "[/ADDITIONAL_VISIBILITY_NEW]";
-                                                + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
-                                                + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
-                                                + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
-                                                + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
-                                                + "[/ADDITIONAL_VISIBILITY_NEW]";
                                         //Here getSku_id gives display_id
 
                                         additional_visibility_data_xml = additional_visibility_data_xml + onXML;
@@ -1089,14 +899,7 @@ public class UploadActivity extends AppCompatActivity {
                                             } else {
                                                 present = "0";
                                             }
-                                            gaps_child = "[GAPS]"
+                                            gaps_child = "[GAPS]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]" + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]" + "[PRESENT]" + present + "[/PRESENT]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/GAPS]";
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                                    + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]"
-                                                    + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]"
-                                                    + "[PRESENT]" + present + "[/PRESENT]"
-                                                    + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
-                                                    + "[/GAPS]";
                                             gaps_xml = gaps_xml + gaps_child;
                                         }
 
@@ -1104,14 +907,7 @@ public class UploadActivity extends AppCompatActivity {
                                         String sku_child;
 
                                         for (int k = 0; k < skuList.size(); k++) {
-                                            sku_child = "[SKU]"
+                                            sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]" + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]" + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/SKU]";
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                                    + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]"
-                                                    + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]"
-                                                    + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]"
-                                                    + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
-                                                    + "[/SKU]";
                                             sku_xml = sku_xml + sku_child;
                                         }
 
@@ -1122,13 +918,9 @@ public class UploadActivity extends AppCompatActivity {
                                         if (brandList.size() > 0) {
 
                                             for (int M = 0; M < brandList.size(); M++) {
-                                                brandchild = "[BRAND]"
+                                                brandchild = "[BRAND]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
                                                         // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"
-                                                        + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+                                                        + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/BRAND]";
-                                                        + "[/BRAND]";
                                                 brandxml = brandxml + brandchild;
                                             }
                                         }
@@ -1144,17 +936,7 @@ public class UploadActivity extends AppCompatActivity {
                                             qty = "0";
                                         }
 
-                                        onXML = "[T2P_DATA]"
+                                        onXML = "[T2P_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]" + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]" + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]" + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]" + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
-                                                + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]"
-                                                + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
-                                                + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]"
-                                                + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
-                                                + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
-                                                + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
 
                                                 //Quantity visibility added for UAE 04.07.2019
                                                 + "[Quantity]" + qty + "[/Quantity]"
@@ -1162,11 +944,7 @@ public class UploadActivity extends AppCompatActivity {
                                                 //Non t2p reason id added - 21-6-2018
                                                 + "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
 
-                                                + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
+                                                + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]" + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]" + "[/T2P_DATA]";
-                                                + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
-                                                + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
-                                                + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
-                                                + "[/T2P_DATA]";
 
                                         t2p_data_xml = t2p_data_xml + onXML;
                                     }
@@ -1202,16 +980,11 @@ public class UploadActivity extends AppCompatActivity {
                                 if (stockFacingPlanogramDataList.size() > 0) {
 
                                     for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) {
-                                        onXML = "[STOCK_FACING_PLANOGRAM_DATA]"
+                                        onXML = "[STOCK_FACING_PLANOGRAM_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]" + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
-                                                + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
                                                 //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
                                                 //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
                                                 //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
-                                                + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
+                                                + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]" + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
-                                                + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
                                                 //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
                                                 + "[/STOCK_FACING_PLANOGRAM_DATA]";
 
@@ -1281,36 +1054,18 @@ public class UploadActivity extends AppCompatActivity {
                                         }
 
                                         String KeyID = adddata.get(J).getKEY_ID();
-
+                                        db.open();
                                         listdat = db.getCategoryPictureListUploaded(KeyID);
 
                                         if (listdat.size() > 0) {
                                             for (int k = 0; k < listdat.size(); k++) {
-                                                onCategoryList = "[SUB_CATEGORY_LIST]"
+                                                onCategoryList = "[SUB_CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]" + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]" + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]" + "[/SUB_CATEGORY_LIST]";
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]"
-                                                        + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
-                                                        + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]"
-                                                        + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]"
-                                                        + "[/SUB_CATEGORY_LIST]";
 
                                                 CategoryLISTDATA = CategoryLISTDATA + onCategoryList;
                                             }
                                         }
 
-                                        onXML = "[CATEGORY_LIST]"
+                                        onXML = "[CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]" + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]" + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]" + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]" + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]" + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]" + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]" + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]" + "[/CATEGORY_LIST]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]"
-                                                + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]"
-                                                + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]"
-                                                + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]"
-                                                + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]"
-                                                + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]"
-                                                + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]"
-                                                + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]"
-                                                + "[/CATEGORY_LIST]";
 
                                         Category_xml = Category_xml + onXML;
                                         CategoryLISTDATA = "";
@@ -1349,17 +1104,7 @@ public class UploadActivity extends AppCompatActivity {
                                                 vertical = 0;
                                             }
 
-                                            onXml_nodata = "[NO_CAMERA_POG_DATA]"
+                                            onXml_nodata = "[NO_CAMERA_POG_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]" + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]" + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]" + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]" + "[IS_VERTICAL]" + vertical + "[/IS_VERTICAL]" + "[/NO_CAMERA_POG_DATA]";
-                                                    + "[MID]" + mid + "[/MID]"
-                                                    + "[USER_ID]" + userId + "[/USER_ID]"
-                                                    + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
-                                                    + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
-                                                    + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
-                                                    + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
-                                                    + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
-                                                    + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
-                                                    + "[IS_VERTICAL]" + vertical + "[/IS_VERTICAL]"
-                                                    + "[/NO_CAMERA_POG_DATA]";
 
                                             No_camera_data = No_camera_data + onXml_nodata;
                                         }
@@ -1395,17 +1140,7 @@ public class UploadActivity extends AppCompatActivity {
                                     String onXml_audit_data = "", Audit_data = "";
                                     for (int n = 0; n < audit_data.size(); n++) {
 
-                                        onXml_audit_data = "[AUDIT_DATA]"
+                                        onXml_audit_data = "[AUDIT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]" + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]" + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]" + "[REMARK]" + audit_data.get(n).getTXT_REMARK() + "[/REMARK]" + "[/AUDIT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
-                                                + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
-                                                + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
-                                                + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
-                                                + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
-                                                + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
-                                                + "[REMARK]" + audit_data.get(n).getTXT_REMARK() + "[/REMARK]"
-                                                + "[/AUDIT_DATA]";
 
                                         Audit_data = Audit_data + onXml_audit_data;
                                     }
@@ -1441,14 +1176,7 @@ public class UploadActivity extends AppCompatActivity {
                                     String onXml_pog_data = "", POG_data = "";
                                     for (int n = 0; n < pog_data.size(); n++) {
 
-                                        onXml_pog_data = "[POG_DATA]"
+                                        onXml_pog_data = "[POG_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + "[/POG_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
-                                                + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
-                                                + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
-                                                + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
-                                                + "[/POG_DATA]";
 
                                         POG_data = POG_data + onXml_pog_data;
                                     }
@@ -1492,13 +1220,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exist = "0";
                                         }
 
-                                        coaching_xml = "[COACHING_VISIT_DATA]"
+                                        coaching_xml = "[COACHING_VISIT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]" + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]" + "[IS_EXIST]" + exist + "[/IS_EXIST]" + "[/COACHING_VISIT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
-                                                + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
-                                                + "[IS_EXIST]" + exist + "[/IS_EXIST]"
-                                                + "[/COACHING_VISIT_DATA]";
                                         onXml_coaching_data = onXml_coaching_data + coaching_xml;
                                     }
 
@@ -1541,13 +1263,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exist = "0";
                                         }
 
-                                        coaching_xml = "[CHECK_VISIT_DATA]"
+                                        coaching_xml = "[CHECK_VISIT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]" + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]" + "[IS_EXIST]" + exist + "[/IS_EXIST]" + "[/CHECK_VISIT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
-                                                + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
-                                                + "[IS_EXIST]" + exist + "[/IS_EXIST]"
-                                                + "[/CHECK_VISIT_DATA]";
                                         onXml_coaching_data = onXml_coaching_data + coaching_xml;
                                     }
 
@@ -1589,17 +1305,7 @@ public class UploadActivity extends AppCompatActivity {
                                         for (int i1 = 0; i1 < counterfeitProductGetterSetters.size(); i1++) {
                                             if (!counterfeitProductGetterSetters.get(i1).getCategory_id().equals("0")) {
 
-                                                product_add_xml = "[PRODUCT_DATA]"
+                                                product_add_xml = "[PRODUCT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]" + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]" + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]" + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]" + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]" + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]" + "[/PRODUCT_DATA]";
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                        + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]"
-                                                        + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
-                                                        + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]"
-                                                        + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]"
-                                                        + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]"
-                                                        + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]"
-                                                        + "[/PRODUCT_DATA]";
 
                                                 add_product_data_xml = add_product_data_xml + product_add_xml;
                                             }
@@ -1610,13 +1316,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exists = 1;
                                         }
 
-                                        product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]"
+                                        product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]" + "[IS_EXISTS]" + exists + "[/IS_EXISTS]" + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]" + "[/COUNTERFEIT_PRODUCT_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
-                                                + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]"
-                                                + "[/COUNTERFEIT_PRODUCT_DATA]";
 
                                         counterfeit_product_data_xml = counterfeit_product_data_xml + product_exists_xml;
 
@@ -1665,15 +1365,7 @@ public class UploadActivity extends AppCompatActivity {
                                         for (int i1 = 0; i1 < competitonGetterSetters.size(); i1++) {
                                             if (!competitonGetterSetters.get(i1).getCategory_id().equals("0")) {
 
-                                                competiton_add_xml = "[COMPETITION_DATA]"
+                                                competiton_add_xml = "[COMPETITION_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]" + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]" + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]" + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]" + "[/COMPETITION_DATA]";
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USER_ID]" + userId + "[/USER_ID]"
-                                                        + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
-                                                        + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]"
-                                                        + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
-                                                        + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]"
-                                                        + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]"
-                                                        + "[/COMPETITION_DATA]";
 
                                                 add_competiton_data_xml = add_competiton_data_xml + competiton_add_xml;
                                             }
@@ -1684,13 +1376,7 @@ public class UploadActivity extends AppCompatActivity {
                                             exists = 1;
                                         }
 
-                                        competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]"
+                                        competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]" + "[IS_EXISTS]" + exists + "[/IS_EXISTS]" + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]" + "[/COMPETITION_PROMOTION_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                                + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
-                                                + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]"
-                                                + "[/COMPETITION_PROMOTION_DATA]";
 
                                         competiton_data_xml = competiton_data_xml + competiton_exists_xml;
 
@@ -1729,32 +1415,15 @@ public class UploadActivity extends AppCompatActivity {
 
                                 if (ordertakingdata.size() > 0) {
                                     for (int k = 0; k < getOrder_TAKING_CategoryData.size(); k++) {
-                                        _onxml = "[CATEGORY_DATA]"
+                                        _onxml = "[CATEGORY_DATA]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[PRESENT]" + getOrder_TAKING_CategoryData.get(k).getIsExist() + "[/PRESENT]" + "[CATEGORY_ID]" + getOrder_TAKING_CategoryData.get(k).getCategory_id() + "[/CATEGORY_ID]" + "[/CATEGORY_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[PRESENT]" + getOrder_TAKING_CategoryData.get(k).getIsExist() + "[/PRESENT]"
-                                                + "[CATEGORY_ID]" + getOrder_TAKING_CategoryData.get(k).getCategory_id() + "[/CATEGORY_ID]"
-                                                + "[/CATEGORY_DATA]";
                                         categoryxml = categoryxml + _onxml;
                                     }
 
                                     String cat_xml = categoryxml;
                                     for (int j = 0; j < ordertakingdata.size(); j++) {
                                         if (ordertakingdata.get(j).getIsExist() == 1) {
-                                            if (!ordertakingdata.get(j).getFacing().equals("0") &&
+                                            if (!ordertakingdata.get(j).getFacing().equals("0") && !ordertakingdata.get(j).getFacing().equals("")) {
-                                                    !ordertakingdata.get(j).getFacing().equals("")) {
+                                                onXML = "[ORDER_TAKING]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[CATEGORY_ID]" + ordertakingdata.get(j).getCategory_id() + "[/CATEGORY_ID]" + "[SYSTEM_PO_NUM]" + ordertakingdata.get(j).getSys_PO_No() + "[/SYSTEM_PO_NUM]" + "[STORE_PO_NUM]" + ordertakingdata.get(j).getStore_PO_No() + "[/STORE_PO_NUM]" + "[PO_DATE]" + ordertakingdata.get(j).getPO_Date() + "[/PO_DATE]" + "[BRAND_ID]" + ordertakingdata.get(j).getBrand_id() + "[/BRAND_ID]" + "[SKU_ID]" + ordertakingdata.get(j).getSku_id() + "[/SKU_ID]" + "[ORDER_QTY]" + ordertakingdata.get(j).getFacing() + "[/ORDER_QTY]" + "[PO_IMAGE]" + ordertakingdata.get(j).getPO_Img() + "[/PO_IMAGE]" + "[/ORDER_TAKING]";
-                                                onXML = "[ORDER_TAKING]"
-                                                        + "[MID]" + mid + "[/MID]"
-                                                        + "[USERID]" + userId + "[/USERID]"
-                                                        + "[CATEGORY_ID]" + ordertakingdata.get(j).getCategory_id() + "[/CATEGORY_ID]"
-                                                        + "[SYSTEM_PO_NUM]" + ordertakingdata.get(j).getSys_PO_No() + "[/SYSTEM_PO_NUM]"
-                                                        + "[STORE_PO_NUM]" + ordertakingdata.get(j).getStore_PO_No() + "[/STORE_PO_NUM]"
-                                                        + "[PO_DATE]" + ordertakingdata.get(j).getPO_Date() + "[/PO_DATE]"
-                                                        + "[BRAND_ID]" + ordertakingdata.get(j).getBrand_id() + "[/BRAND_ID]"
-                                                        + "[SKU_ID]" + ordertakingdata.get(j).getSku_id() + "[/SKU_ID]"
-                                                        + "[ORDER_QTY]" + ordertakingdata.get(j).getFacing() + "[/ORDER_QTY]"
-                                                        + "[PO_IMAGE]" + ordertakingdata.get(j).getPO_Img() + "[/PO_IMAGE]" +
-                                                        "[/ORDER_TAKING]";
                                                 order_taking_xml = order_taking_xml + onXML;
                                             }
                                         }
@@ -1793,16 +1462,7 @@ public class UploadActivity extends AppCompatActivity {
                                 ArrayList<MSL_AvailabilityStockFacingGetterSetter> orderreceiveddata = db.getOrder_RECEIVED_UploadServerData(coverageList.get(i).getStoreId());
                                 if (orderreceiveddata.size() > 0) {
                                     for (int j = 0; j < orderreceiveddata.size(); j++) {
-                                        onXML = "[ORDER_CONFIRM]"
+                                        onXML = "[ORDER_CONFIRM]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[CATEGORY_ID]" + orderreceiveddata.get(j).getCategory_id() + "[/CATEGORY_ID]" + "[PO_DATE]" + orderreceiveddata.get(j).getPO_Date() + "[/PO_DATE]" + "[POID]" + orderreceiveddata.get(j).getPOID() + "[/POID]" + "[SKU_ID]" + orderreceiveddata.get(j).getSku_id() + "[/SKU_ID]" + "[PO_QTY]" + orderreceiveddata.get(j).getOrderqty() + "[/PO_QTY]" + "[ACTUAL_QTY]" + orderreceiveddata.get(j).getFacing() + "[/ACTUAL_QTY]" + "[/ORDER_CONFIRM]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[CATEGORY_ID]" + orderreceiveddata.get(j).getCategory_id() + "[/CATEGORY_ID]"
-                                                + "[PO_DATE]" + orderreceiveddata.get(j).getPO_Date() + "[/PO_DATE]"
-                                                + "[POID]" + orderreceiveddata.get(j).getPOID() + "[/POID]"
-                                                + "[SKU_ID]" + orderreceiveddata.get(j).getSku_id() + "[/SKU_ID]"
-                                                + "[PO_QTY]" + orderreceiveddata.get(j).getOrderqty() + "[/PO_QTY]"
-                                                + "[ACTUAL_QTY]" + orderreceiveddata.get(j).getFacing() + "[/ACTUAL_QTY]" +
-                                                "[/ORDER_CONFIRM]";
 
                                         order_received_xml = order_received_xml + onXML;
                                     }
@@ -1839,16 +1499,9 @@ public class UploadActivity extends AppCompatActivity {
                                 String irPD_xmlData = "";
                                 onXML = "";
                                 ArrayList<CategoryPictureGetterSetter> irdata = db.getIrPDforUpload(coverageList.get(i).getStoreId(), coverageList.get(i).getVisitDate());
-                                if (irdata!=null && !irdata.isEmpty()) {
+                                if (irdata != null && !irdata.isEmpty()) {
                                     for (int j = 0; j < irdata.size(); j++) {
-                                        onXML = "[IR_DATA]"
+                                        onXML = "[IR_DATA]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[CATEGORY_ID]" + irdata.get(j).getCategoryId() + "[/CATEGORY_ID]" + "[SUB_CATEGORY_ID]" + irdata.get(j).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + "[SUB_CATEGORY_CODE]" + irdata.get(j).getSubCatCode() + "[/SUB_CATEGORY_CODE]" + "[IR_IMAGES]" + irdata.get(j).getSubCategoryCamera2() + "[/IR_IMAGES]" + "[/IR_DATA]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[CATEGORY_ID]" + irdata.get(j).getCategoryId() + "[/CATEGORY_ID]"
-                                                + "[SUB_CATEGORY_ID]" + irdata.get(j).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
-                                                + "[SUB_CATEGORY_CODE]" + irdata.get(j).getSubCatCode() + "[/SUB_CATEGORY_CODE]"
-                                                + "[IR_IMAGES]" + irdata.get(j).getSubCategoryCamera2() + "[/IR_IMAGES]"
-                                                + "[/IR_DATA]";
 
                                         irPD_xmlData = irPD_xmlData + onXML;
                                     }
@@ -1881,12 +1534,7 @@ public class UploadActivity extends AppCompatActivity {
                                 ArrayList<Visit_Type_Master_GetterSetter> visittypelist = db.getUploadedVisitType(coverageList.get(i).getStoreId());
                                 if (!visittypelist.isEmpty()) {
                                     for (int j = 0; j < visittypelist.size(); j++) {
-                                        onXML = "[VISIT_TYPE_STATUS]"
+                                        onXML = "[VISIT_TYPE_STATUS]" + "[MID]" + mid + "[/MID]" + "[USERID]" + userId + "[/USERID]" + "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]" + "[VISIT_TYPE_ID]" + visittypelist.get(j).getVISIT_TYPE_ID().get(0) + "[/VISIT_TYPE_ID]" + "[/VISIT_TYPE_STATUS]";
-                                                + "[MID]" + mid + "[/MID]"
-                                                + "[USERID]" + userId + "[/USERID]"
-                                                + "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]"
-                                                + "[VISIT_TYPE_ID]" + visittypelist.get(j).getVISIT_TYPE_ID().get(0) + "[/VISIT_TYPE_ID]"
-                                                + "[/VISIT_TYPE_STATUS]";
 
                                         visit_xml = visit_xml + onXML;
                                     }
@@ -1922,12 +1570,7 @@ public class UploadActivity extends AppCompatActivity {
                             // SET COVERAGE STATUS
                             String final_xml = "";
                             onXML = "";
-                            onXML = "[COVERAGE_STATUS]"
+                            onXML = "[COVERAGE_STATUS]" + "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]" + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]" + "[USER_ID]" + coverageList.get(i).getUserId() + "[/USER_ID]" + "[STATUS]" + CommonString.KEY_D + "[/STATUS]" + "[/COVERAGE_STATUS]";
-                                    + "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]"
-                                    + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                    + "[USER_ID]" + coverageList.get(i).getUserId() + "[/USER_ID]"
-                                    + "[STATUS]" + CommonString.KEY_D + "[/STATUS]"
-                                    + "[/COVERAGE_STATUS]";
 
                             final_xml = final_xml + onXML;
 
@@ -1954,8 +1597,7 @@ public class UploadActivity extends AppCompatActivity {
                                 publishProgress(data);
 
                                 db.open();
-                                db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
+                                db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i).getVisitDate(), CommonString.KEY_D, coverageList.get(i).getFlag_from());
-                                        .getVisitDate(), CommonString.KEY_D, coverageList.get(i).getFlag_from());
 
                             }
                             data.value = 90;
@@ -2003,8 +1645,7 @@ public class UploadActivity extends AppCompatActivity {
     public void showAlert(String str) {
         AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this);
         builder.setTitle("Parinaam");
-        builder.setMessage(str).setCancelable(false)
+        builder.setMessage(str).setCancelable(false).setPositiveButton(R.string.ok, (dialog, id) -> finish());
-                .setPositiveButton(R.string.ok, (dialog, id) -> finish());
         AlertDialog alert = builder.create();
         alert.show();
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -5,6 +5,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
+import cpm.com.gskmtorange.GetterSetter.PD_CONFIGURATION;
 import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -357,6 +358,7 @@ public class XMLHandlers {
                         category.setPD_SUB_CATEGORY_CODE(xpp.nextText());
                     }
                 }
+
                 xpp.next();
             }
         } catch (XmlPullParserException e) {
@@ -1796,4 +1798,28 @@ public class XMLHandlers {
         return visittype;
     }
 
+    // JCP XML HANDLER
+    public static PD_CONFIGURATION PDConfigXMLHandler(XmlPullParser xpp) {
+        PD_CONFIGURATION jcpGetterSetter = new PD_CONFIGURATION();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+                    if (xpp.getName().equals("PROJECT_ID")) {
+                        jcpGetterSetter.setPROJECT_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("USER_ID")) {
+                        jcpGetterSetter.setUSER_ID(xpp.nextText());
+                    }
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException | IOException e) {
+            e.fillInStackTrace();
+        }
+
+        return jcpGetterSetter;
+    }
+
 }

build.gradle

@@ -1,23 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         jcenter()
-       // mavenCentral()
+        mavenCentral()
-        maven {
+        maven { url "https://jitpack.io" }
-            url "https://jitpack.io"
-        }
     }
+
     dependencies {
-      //  classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:8.10.1'
-       // classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath("com.google.gms:google-services:4.4.2")
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.3'
-        //classpath 'com.google.gms:google-services:4.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22'
     }
 }
 
@@ -25,7 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-       // mavenCentral()
+        mavenCentral()
         maven {
             url "https://jitpack.io"
         }

gradle.properties

@@ -1,29 +1,14 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-
-android.enableAapt2=true
 org.gradle.jvmargs=-Xmx4096m
 android.enableJetifier=true
 android.useAndroidX=true
-
+kotlin.incremental=true
-
+android.enableAapt2=true
-#android.enableAapt2=true
+android.suppressUnsupportedCompileSdk=35
-#android.debug.obsoleteApi=true
-#android.useAndroidX=true
-#android.enableJetifier=true
-#org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jun 05 13:50:56 IST 2024
+#Tue Jun 03 11:00:26 IST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle

@@ -24,13 +24,11 @@ ext {
 }
 
 android {
-    compileSdkVersion 31
+    namespace("com.androidbuts.multispinnerfilter")
-   // buildToolsVersion '28.0.3'
+    compileSdk(35)
     defaultConfig {
-        minSdkVersion 20
+        minSdkVersion 24
-        targetSdkVersion 29
+        targetSdk(35)
-        versionCode 1
-        versionName '1.0'
     }
     buildTypes {
         release {
@@ -38,11 +36,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
     productFlavors {
+
     }
 }
 
 dependencies {
     implementation 'com.github.rey5137:material:1.2.2'
-
 }

library/build/.transforms/5f026ab275f9e9d1434019530aa35201/results.bin

@@ -0,0 +1 @@
+o/bundleLibRuntimeToDirRelease

library/build/.transforms/b0d4d1c39e3443dda94314a4e6bcabe9/results.bin

@@ -0,0 +1 @@
+o/classes

library/build/generated/source/buildConfig/release/com/androidbuts/multispinnerfilter/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.androidbuts.multispinnerfilter;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter";
-  public static final String BUILD_TYPE = "release";
-}

library/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.androidbuts.multispinnerfilter" >
 
-    <uses-sdk android:minSdkVersion="20" />
+    <uses-sdk android:minSdkVersion="24" />
 
     <application android:allowBackup="true" >
     </application>

library/build/intermediates/aar_metadata/release/writeReleaseAarMetadata/aar-metadata.properties

@@ -3,3 +3,4 @@ aarMetadataVersion=1.0
 minCompileSdk=1
 minCompileSdkExtension=0
 minAndroidGradlePluginVersion=1.0.0
+coreLibraryDesugaringEnabled=false

library/build/intermediates/compile_symbol_list/release/generateReleaseRFile/R.txt

@@ -0,0 +1,45 @@
+int attr hintText 0x0
+int color ColorPrimary 0x0
+int color ColorPrimaryDark 0x0
+int color android_text_color 0x0
+int color app_topbar_color 0x0
+int color background_color 0x0
+int color black 0x0
+int color blue 0x0
+int color cyan 0x0
+int color gray 0x0
+int color lightBlue 0x0
+int color list_background 0x0
+int color list_even 0x0
+int color list_header 0x0
+int color list_odd 0x0
+int color list_selected 0x0
+int color primary 0x0
+int color primary_dark 0x0
+int color primary_pressed 0x0
+int color red 0x0
+int color ripple 0x0
+int color text_color 0x0
+int color white 0x0
+int dimen activity_horizontal_margin 0x0
+int dimen activity_vertical_margin 0x0
+int id alertCheckbox 0x0
+int id alertSearchEditText 0x0
+int id alertSearchListView 0x0
+int id alertTextView 0x0
+int id empty 0x0
+int id listTextViewSpinner 0x0
+int id searchMultiSpinner 0x0
+int id simpleMultiSpinner 0x0
+int layout activity_main 0x0
+int layout alert_dialog_listview_search 0x0
+int layout item_listview_multiple 0x0
+int layout item_listview_single 0x0
+int layout textview_for_spinner 0x0
+int string type_to_search 0x0
+int style DialogWindowTitle 0x0
+int style MaterialSpinner 0x0
+int style myDialog 0x0
+int style myDialogTitle 0x0
+int[] styleable MultiSpinnerSearch { 0x0 }
+int styleable MultiSpinnerSearch_hintText 0

library/build/intermediates/incremental/mergeReleaseAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\release\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet></merger>

library/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\release\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\release\jniLibs"/></dataSet></merger>

library/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\release\shaders"/></dataSet></merger>

library/build/intermediates/incremental/packageReleaseAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\assets"/><source path="D:\Haleon_Kenya_pd-git\library\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\release\assets"/></dataSet></merger>

library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties

@@ -1,6 +1,6 @@
-#Mon Mar 17 16:20:18 IST 2025
+#Fri Jun 06 19:00:06 IST 2025
-com.androidbuts.multispinnerfilter.library-main-6\:/layout/activity_main.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
+com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml
-com.androidbuts.multispinnerfilter.library-main-6\:/layout/alert_dialog_listview_search.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
+com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
-com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_single.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
+com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml
-com.androidbuts.multispinnerfilter.library-main-6\:/layout/textview_for_spinner.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
+com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_single.xml
-com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_multiple.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
+com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_multiple.xml

library/build/intermediates/incremental/release/packageReleaseResources/merger.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\res"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\rs\release"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\res"><file name="activity_main" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res"><file name="activity_main" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
         <item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
         <item name="spn_labelEnable">true</item>
         <item name="spn_labelTextSize">18sp</item>
@@ -14,9 +14,9 @@
         <item name="android:maxLines">1</item>
         <item name="android:scrollHorizontally">true</item>
         <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
-    </style></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
+    </style></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
         <attr format="string" name="hintText"/>
-    </declare-styleable></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
+    </declare-styleable></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
         <item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
         <item name="spn_labelEnable">true</item>
         <item name="spn_labelTextSize">18sp</item>
@@ -31,4 +31,4 @@
         <item name="android:maxLines">1</item>
         <item name="android:scrollHorizontally">true</item>
         <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
-    </style></file></source><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\rs\release"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
+    </style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\resValues\release"/></dataSet><mergedItems/></merger>