initial_commit

.idea/deploymentTargetSelector.xml

@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-04-17T05:11:06.218957500Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ravik\.android\avd\Pixel_2.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

app/build.gradle

@@ -21,7 +21,6 @@ android {
             abiFilters.add("armeabi-v7a")
             abiFilters.add("arm64-v8a")
         }
-
     }
     signingConfigs {
         config {

app/src/main/java/com/cpm/lorealbaMabeline/CounterLoginActivity.java

@@ -307,7 +307,7 @@ public class CounterLoginActivity extends AppCompatActivity implements View.OnCl
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("Latitude", lat);
             jsonObject.put("Longitude", lon);
-            jsonObject.put("Appversion", app_ver +"T1");
+            jsonObject.put("Appversion", app_ver +"T2");
             jsonObject.put("Attmode", "0");
             jsonObject.put("Networkstatus", "0");
             jsonObject.put("Manufacturer", manufacturer);
@@ -502,7 +502,7 @@ public class CounterLoginActivity extends AppCompatActivity implements View.OnCl
         try {
             PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
-            versioncode_txt.setText("Version : " + version +"-T1");
+            versioncode_txt.setText("Version : " + version +"-T2");
         } catch (PackageManager.NameNotFoundException e) {
             e.fillInStackTrace();
             versioncode_txt.setText("Version : 0.0");

app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java

@@ -1686,7 +1686,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
 
             if (filledregularstock) {
                 dbcursor = db.rawQuery("select distinct t1.AxeName as AxeName,t1.SubAxeName as SubAxeName,t1.BrandName as BrandName," + "t1.SignatureName as SignatureName,t1.NuanceName as NuanceName,t1.ImagePath as ImagePath from DR_TESTER_HEADER_DATA t1 " + "inner join Product_Master t2 on  t1.NuanceName= t2.NuanceName and t1.SubAxeName=t2.SubAxeName " + "Inner Join  T_StockSummary TS ON  t1.NuanceName= t2.NuanceName and t1.SubAxeName=t2.SubAxeName  and  TS.ProductId = t2.ProductId  where TS.TesterBalance >'0' and t1.Visit_Date ='" + visitDate + "'", null);
-
             } else {
                 dbcursor = db.rawQuery("select * from " + CommonString.TABLE_INSERT_HEADER_TESTER_DATA + " where Visit_Date ='" + visitDate + "'", null);
             }
@@ -1696,7 +1695,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {
                     ProductMaster sb = new ProductMaster();
-
                     sb.setSubBrandName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("AxeName")));
                     sb.setSubAxeName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SubAxeName")));
                     sb.setBrandName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BrandName")));

app/src/main/java/com/cpm/lorealbaMabeline/DealarBoardActivity.java

@@ -818,7 +818,7 @@ public class DealarBoardActivity extends AppCompatActivity implements Navigation
         try {
             PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
-            version_code.setText("Version : " + version +"-T1");
+            version_code.setText("Version : " + version +"-T2");
         } catch (PackageManager.NameNotFoundException e) {
             e.fillInStackTrace();
             version_code.setText("Version : 0.0");

app/src/main/java/com/cpm/lorealbaMabeline/IMEILoginActivity.java

@@ -166,7 +166,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
         try {
             PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
-            versioncode_txt.setText("Version : " + version+"-T1");
+            versioncode_txt.setText("Version : " + version+"-T2");
         } catch (PackageManager.NameNotFoundException e) {
             e.fillInStackTrace();
             versioncode_txt.setText("Version : 0.0");

app/src/main/java/com/cpm/lorealbaMabeline/UserLoginActivity.java

@@ -283,7 +283,7 @@ public class UserLoginActivity extends AppCompatActivity implements View.OnClick
         try {
             PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
-            versioncode_txt.setText("Version : " + version +"-T1");
+            versioncode_txt.setText("Version : " + version +"-T2");
         } catch (PackageManager.NameNotFoundException e) {
             e.fillInStackTrace();
             versioncode_txt.setText("Version : 0.0");

app/src/main/java/com/cpm/lorealbaMabeline/consumeractivity/ConsumerUserDetailsActivity.java

@@ -55,6 +55,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cpm.lorealbaMabeline.gsonGetterSetter.PromotionMaster;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.gson.Gson;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
@@ -841,6 +842,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
                         } else {
                             ///--------Check Promotion--------------
+                       // Toast.makeText(context,"Testpromo",Toast.LENGTH_SHORT).show();
                             db.open();
                             db.insert_temp_sales_data(visit_date, CounterId, selected_list);
                             if (check_isPromo() && !product_add_flag) {
@@ -4141,7 +4143,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                         }
                                     }
                                 }
-
                                 invoiceGetterSetter.setProduct(String.valueOf(tip_cal));
                                 invoiceGetterSetter.setProduct_Id("0");
                                 //////added applyied products in list
@@ -4505,7 +4506,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
     class LoadTask extends AsyncTask<Boolean, Void, Void> {
         boolean flag = false;
-
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
@@ -4520,11 +4520,27 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
         @Override
         protected Void doInBackground(Boolean... bool) {
+            try {
+                //Toast.makeText(context,"Promo Check",Toast.LENGTH_SHORT).show();
+                FirebaseCrashlytics.getInstance().log("LoadTask started");
                 flag = bool[0];
+                FirebaseCrashlytics.getInstance().log("Flag value: " + flag);
+
                 if (flag) {
+                    FirebaseCrashlytics.getInstance().log("Step: added_check_promotion START");
                     added_check_promotion();
+                    FirebaseCrashlytics.getInstance().log("Step: added_check_promotion END");
                 } else {
+                    FirebaseCrashlytics.getInstance().log("Step: check_promotion_for_worth START");
                     check_promotion_for_worth();
+                    FirebaseCrashlytics.getInstance().log("Step: check_promotion_for_worth END");
+                }
+                FirebaseCrashlytics.getInstance().log("LoadTask completed");
+
+            } catch (Throwable t) {   // 👈 MUST BE Throwable
+                FirebaseCrashlytics.getInstance().log("Crash in doInBackground");
+                FirebaseCrashlytics.getInstance().recordException(t);
+                t.printStackTrace();
             }
             return null;
         }
@@ -4532,11 +4548,26 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
         @Override
         protected void onPostExecute(Void aVoid) {
             super.onPostExecute(aVoid);
-            dialog.dismiss();
+            //dialog.dismiss();
-
+           /* try {
                 if (dialog != null && dialog.isShowing()) {
                     dialog.dismiss();
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }*/
+            try {
+                if (context instanceof Activity) {
+                    Activity activity = (Activity) context;
+
+                    if (!activity.isFinishing() && dialog != null && dialog.isShowing()) {
+                        dialog.dismiss();
+                    }
+                }
+            } catch (Throwable t) {   // 👈 use Throwable, not Exception
+                t.printStackTrace();
+                FirebaseCrashlytics.getInstance().recordException(t);
+            }
         }
     }
 
@@ -4613,15 +4644,40 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                 }
                 if (!validPromoList.isEmpty()) {
                     runOnUiThread(() -> {
-                        if (dialog != null && dialog.isShowing()) {
+                       /* if (dialog != null && dialog.isShowing()) {
                             dialog.dismiss();
                         }
                         show_promotion_skuwise_dialog(context, selected_list, validPromoList, false);
+   */
+                        try {
+                            if (context instanceof Activity) {
+                                Activity activity = (Activity) context;
+
+                                if (!activity.isFinishing()) {
+
+                                    if (dialog != null && dialog.isShowing()) {
+                                        dialog.dismiss();
+                                    }
+
+                                    show_promotion_skuwise_dialog(context, selected_list, validPromoList, false);
+                                }
+                            }
+                        } catch (Throwable t) {
+                            t.printStackTrace();
+                            FirebaseCrashlytics.getInstance().recordException(t);
+                        }
                     });
                 } else {
                     ///finish
+                try{
                     checkPromoWorth(promoMaster);
                 }
+                catch(Throwable t){
+                    t.printStackTrace();
+                    FirebaseCrashlytics.getInstance().recordException(t);
+                }
+
+                }
             } else {
                 ////get promotion by jeevan
                 ////for worth promotion
@@ -4726,12 +4782,14 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                 }
 
             }
-        } catch (NumberFormatException e) {
+        } catch (Throwable t) {
-            e.fillInStackTrace();
+            t.printStackTrace();
+            FirebaseCrashlytics.getInstance().recordException(t);
         }
     }
 
     private void checkPromoWorth(ArrayList<MasterPromotion> promoMaster) {
+        try{
             db.open();
             promoMaster = db.getPromotionMaster(false);
             if (!promoMaster.isEmpty()) {
@@ -4830,6 +4888,11 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                     added_prmo_products = new ArrayList<>();
                 });
             }
+        } catch (Throwable t) {
+            t.printStackTrace();
+            FirebaseCrashlytics.getInstance().recordException(t);
+        }
+
     }
 
     private void check_promotion_for_worth() {
@@ -4929,8 +4992,9 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                     added_prmo_products = new ArrayList<>();
                 });
             }
-        } catch (NumberFormatException e) {
+        } catch (Throwable t) {
-            e.fillInStackTrace();
+            t.printStackTrace();
+            FirebaseCrashlytics.getInstance().recordException(t);
         }
     }
 

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/StoreImageActivity.java

@@ -1046,6 +1046,8 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
                         builder.setMessage(msg).setCancelable(false).setPositiveButton(getResources().getString(R.string.ok), (dialog1, id) -> {
                             dialog1.dismiss();
                             finishAffinity();
+                           /* Intent in = new Intent(this, DealarBoardActivity.class);
+                            startActivity(in);*/
                         });
                         AlertDialog alert = builder.create();
                         alert.show();

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java

@@ -260,7 +260,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
         try {
             PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
-            versioncode_txt.setText("Version : " + version +"-T1");
+            versioncode_txt.setText("Version : " + version +"-T2");
         } catch (PackageManager.NameNotFoundException e) {
             e.fillInStackTrace();
             versioncode_txt.setText("Version : 0.0");
@@ -329,7 +329,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
             jsonObject.put("CounterId", counterId);
             jsonObject.put("Latitude", lat);
             jsonObject.put("Longitude", lon);
-            jsonObject.put("Appversion", app_ver +"-T1");
+            jsonObject.put("Appversion", app_ver +"-T2");
             jsonObject.put("Attmode", "0");
             jsonObject.put("Networkstatus", "0");
             jsonObject.put("ModelNumber", model);

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

@@ -1,4 +1,4 @@
-#Mon Mar 23 16:15:42 IST 2026
+#Fri Apr 17 11:29:49 IST 2026
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=E\:\\LorealBa-MNY-Latest-2024\\LorealBA-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=E\:\\LorealBa-MNY-Latest-2024\\LorealBA-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=E\:\\LorealBa-MNY-Latest-2024\\LorealBA-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml

library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml

@@ -3,5 +3,5 @@
   <compose-theme-adapter versions="0.1.0-dev16,0.1.0-dev17,1.0.0-alpha01,1.0.0-alpha02,1.0.0-alpha03,1.0.0-alpha04,1.0.0-alpha05,1.0.0-alpha06,1.0.0-alpha07,1.0.0-alpha08,1.0.0-alpha09,1.0.0-alpha10,1.0.0-alpha11,1.0.0-alpha12,1.0.0-beta01,1.0.0-beta02,1.0.0-beta03,1.0.0-beta04,1.0.0-beta05,1.0.0-beta06,1.0.0-beta07,1.0.0-beta08,1.0.0-beta09,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.1.0,1.1.1,1.1.2,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8,1.1.9,1.1.10,1.1.11,1.1.12,1.1.13,1.1.14,1.1.15,1.1.16,1.1.17,1.1.18,1.1.19,1.1.20,1.1.21,1.1.22,1.2.0,1.2.1"/>
   <compose-theme-adapter-3 versions="1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17,1.0.18,1.0.19,1.0.20,1.0.21,1.0.22,1.1.0,1.1.1"/>
   <compose-theme-adapter-core versions="1.0.0,1.0.1"/>
-  <material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.13.0,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03,1.14.0-alpha04,1.14.0-alpha05,1.14.0-alpha06,1.14.0-alpha07,1.14.0-alpha08,1.14.0-alpha09,1.14.0-alpha10"/>
+  <material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.13.0,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03,1.14.0-alpha04,1.14.0-alpha05,1.14.0-alpha06,1.14.0-alpha07,1.14.0-alpha08,1.14.0-alpha09,1.14.0-alpha10,1.14.0-beta01"/>
 </com.google.android.material>

library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml

@@ -146,6 +146,7 @@
   <androidx.viewpager2/>
   <androidx.wear/>
   <androidx.wear.compose/>
+  <androidx.wear.compose.remote/>
   <androidx.wear.protolayout/>
   <androidx.wear.tiles/>
   <androidx.wear.watchface/>