From d0e3d1c74fc6327a6184163ab525afa5050ddb93 Mon Sep 17 00:00:00 2001 From: "saad.siddiq" Date: Wed, 4 Jun 2025 11:47:17 +0500 Subject: [PATCH] Add app version --- .../activities/DashboardActivity.java | 18 ++++++++++++++++++ .../HSETrainingForms/HseTwoActivity.java | 1 + .../InjuryRecordForms/InjuryFormThree.java | 5 +++-- .../activities/LoginActivity.java | 10 ++++------ .../ObservationTwoActivity.java | 1 + .../OtherHseActivity.java | 1 + .../PermitToWorkForms/PermitTwoActivity.java | 1 + .../ProgressiveActivity.java | 1 + .../WeeklyActivityForms/WeeklyFormOne.java | 1 + .../apiservice/GiteaClient.java | 2 +- .../fragments/HomeFragment.java | 16 +++++++++++++++- .../utils/StorageManager/HseReportRequest.java | 12 +++++++++++- .../utils/StorageManager/StorageManager.java | 9 +++++++++ .../viewmodels/LoginViewModel.java | 2 +- 14 files changed, 68 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/DashboardActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/DashboardActivity.java index e9e10fe..e5fb798 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/DashboardActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/DashboardActivity.java @@ -2,6 +2,8 @@ package com.utopiaindustries.hseobservationsapp.activities; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -24,6 +26,7 @@ import com.utopiaindustries.hseobservationsapp.R; import com.utopiaindustries.hseobservationsapp.adapters.PagerAdapter; import com.utopiaindustries.hseobservationsapp.helper.Helper; import com.utopiaindustries.hseobservationsapp.helper.Preference; +import com.utopiaindustries.hseobservationsapp.utils.StorageManager.StorageManager; public class DashboardActivity extends AppCompatActivity { @@ -78,6 +81,8 @@ public class DashboardActivity extends AppCompatActivity { img_back = findViewById(R.id.img_back); imgLogout = findViewById(R.id.img_logout); + setAppVersion(); + viewPager = (ViewPager) findViewById(R.id.viewpager); pagerAdapter = new PagerAdapter(getSupportFragmentManager(), DashboardActivity.this); viewPager.setAdapter(pagerAdapter); @@ -94,6 +99,19 @@ public class DashboardActivity extends AppCompatActivity { } } + public void setAppVersion() { + PackageManager packageManager = getPackageManager(); + try { + PackageInfo info = packageManager.getPackageInfo( getPackageName(), 0 ); + + String currentVersion = String.format("v-%s", String.valueOf(info.versionName)); + StorageManager.getInstance().setAppVersion(currentVersion); + + } catch ( Exception e ) { + e.printStackTrace(); + } + } + public void alertLogOut(Context con) { ViewGroup viewGroup = findViewById(android.R.id.content); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/HSETrainingForms/HseTwoActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/HSETrainingForms/HseTwoActivity.java index 9f2fcc1..f3bcfbe 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/HSETrainingForms/HseTwoActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/HSETrainingForms/HseTwoActivity.java @@ -307,6 +307,7 @@ public class HseTwoActivity extends AppCompatActivity implements EasyPermissions hseTrainingRequest.setFloorId(StorageManager.getInstance().getFloorId()); hseTrainingRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); hseTrainingRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, HseTwoActivity.this)); + hseTrainingRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); hseTrainingRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormThree.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormThree.java index b449e27..080f74e 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormThree.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormThree.java @@ -212,8 +212,8 @@ public class InjuryFormThree extends AppCompatActivity implements EasyPermission public void onClick(View v) { if (isValidate()) { StorageManager.getInstance().getInjuryRecordModel().get(0).setPictures(PaperImageList); - Log.e("PaperImageList-size: ",""+PaperImageList.size()); - Log.e("Storage-Size: ",""+StorageManager.getInstance().getInjuryRecordModel().get(0).getPictures().size()); + //Log.e("PaperImageList-size: ",""+PaperImageList.size()); + //Log.e("Storage-Size: ",""+StorageManager.getInstance().getInjuryRecordModel().get(0).getPictures().size()); // Toast.makeText(PermitTwoActivity.this,"Reported Submitted",Toast.LENGTH_SHORT).show(); alertReportSubmit(InjuryFormThree.this); } @@ -273,6 +273,7 @@ public class InjuryFormThree extends AppCompatActivity implements EasyPermission hseTrainingRequest.setFloorId(StorageManager.getInstance().getFloorId()); hseTrainingRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); hseTrainingRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, InjuryFormThree.this)); + hseTrainingRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); hseTrainingRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/LoginActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/LoginActivity.java index b7683ff..faabb77 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/LoginActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/LoginActivity.java @@ -30,6 +30,7 @@ import com.utopiaindustries.hseobservationsapp.helper.Preference; import com.utopiaindustries.hseobservationsapp.helper.PropertyReader; import com.utopiaindustries.hseobservationsapp.helper.Release; import com.utopiaindustries.hseobservationsapp.utils.ProgressDialogFragment; +import com.utopiaindustries.hseobservationsapp.utils.StorageManager.StorageManager; import com.utopiaindustries.hseobservationsapp.viewmodels.LoginViewModel; import java.util.Properties; @@ -97,6 +98,9 @@ public class LoginActivity extends AppCompatActivity { PackageInfo info = packageManager.getPackageInfo( getPackageName(), 0 ); txtVersion.setText(String.format("Version: %s", info.versionName)); + String currentVersion = String.format("v-%s", String.valueOf(info.versionName)); + StorageManager.getInstance().setAppVersion(currentVersion); + } catch ( Exception e ) { e.printStackTrace(); } @@ -205,15 +209,12 @@ public class LoginActivity extends AppCompatActivity { * check for updates */ private void checkForUpdates() { - Log.e("checkForUpdates: ","*****"); PackageManager packageManager = getPackageManager(); try { PackageInfo info = packageManager.getPackageInfo( getPackageName(), 0 ); currentVersionName = info.versionName; - Log.e("currentVersionName: ",""+currentVersionName); } catch ( Exception e ) { - Log.e("Version-Exception: ",""+e.getMessage()); e.printStackTrace(); } // adjust views @@ -227,7 +228,6 @@ public class LoginActivity extends AppCompatActivity { call.enqueue( new Callback() { @Override public void onResponse( Call call, Response response ) { - Log.e("Response: ",""+response.body()); if ( response.body() != null ) { Release release = response.body(); try { @@ -243,7 +243,6 @@ public class LoginActivity extends AppCompatActivity { Toast.makeText( LoginActivity.this, "Latest version is already installed", Toast.LENGTH_LONG ).show(); } } catch ( Exception e ) { - Log.e("Response-Exception: ",""+e.getMessage()); Toast.makeText( LoginActivity.this, e.getMessage(), Toast.LENGTH_LONG ).show(); e.printStackTrace(); } @@ -254,7 +253,6 @@ public class LoginActivity extends AppCompatActivity { @Override public void onFailure( Call call, Throwable t ) { dismissProgressDialog(); - Log.e("Failure: ",""+t.getMessage()); t.printStackTrace(); } } ); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java index 257c5aa..9e16902 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java @@ -224,6 +224,7 @@ public class ObservationTwoActivity extends AppCompatActivity { observationRequest.setFloorId(StorageManager.getInstance().getFloorId()); observationRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); observationRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, ObservationTwoActivity.this)); + observationRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); observationRequest.setReportData(observationList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/OtherHSEActivityForms/OtherHseActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/OtherHSEActivityForms/OtherHseActivity.java index 5aff9ad..5e13403 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/OtherHSEActivityForms/OtherHseActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/OtherHSEActivityForms/OtherHseActivity.java @@ -213,6 +213,7 @@ public class OtherHseActivity extends AppCompatActivity { reportRequest.setFloorId(StorageManager.getInstance().getFloorId()); reportRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); reportRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, OtherHseActivity.this)); + reportRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); reportRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitTwoActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitTwoActivity.java index 973279d..c942744 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitTwoActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitTwoActivity.java @@ -289,6 +289,7 @@ public class PermitTwoActivity extends AppCompatActivity implements EasyPermissi hseTrainingRequest.setFloorId(StorageManager.getInstance().getFloorId()); hseTrainingRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); hseTrainingRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, PermitTwoActivity.this)); + hseTrainingRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); hseTrainingRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ProgressiveActivityForms/ProgressiveActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ProgressiveActivityForms/ProgressiveActivity.java index b25cdfe..a70e941 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ProgressiveActivityForms/ProgressiveActivity.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ProgressiveActivityForms/ProgressiveActivity.java @@ -297,6 +297,7 @@ public class ProgressiveActivity extends AppCompatActivity implements EasyPermis reportRequest.setFloorId(StorageManager.getInstance().getFloorId()); reportRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); reportRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, ProgressiveActivity.this)); + reportRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); reportRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/WeeklyActivityForms/WeeklyFormOne.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/WeeklyActivityForms/WeeklyFormOne.java index 1f49e4c..f0a3a97 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/WeeklyActivityForms/WeeklyFormOne.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/WeeklyActivityForms/WeeklyFormOne.java @@ -690,6 +690,7 @@ public class WeeklyFormOne extends AppCompatActivity implements EasyPermissions. reportRequest.setFloorId(StorageManager.getInstance().getFloorId()); reportRequest.setRecordTypeId(StorageManager.getInstance().getRecordTypeId()); reportRequest.setCreatedBy(Preference.getMyStringPref(Helper.project_file, Helper.logInUser, WeeklyFormOne.this)); + reportRequest.setAppVersion(StorageManager.getInstance().getAppVersion()); reportRequest.setReportData(reportList); /*Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/apiservice/GiteaClient.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/apiservice/GiteaClient.java index 8142b2f..7c75eba 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/apiservice/GiteaClient.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/apiservice/GiteaClient.java @@ -5,7 +5,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory; public class GiteaClient { private static Retrofit retrofit; - private static final String BASE_URL = "https://git.utopiadeals.com/api/v1/repos/UIND/Quality-Checker-Android-Releases/"; + private static final String BASE_URL = "https://git.utopiadeals.com/api/v1/repos/UIND/HSE-Android-Releases/"; /** * get retrofit instance diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/fragments/HomeFragment.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/fragments/HomeFragment.java index 7c2921d..804ed50 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/fragments/HomeFragment.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/fragments/HomeFragment.java @@ -128,9 +128,23 @@ public class HomeFragment extends Fragment { //Toast.makeText(getActivity(), "Item clicked: " + siteArrayList.get(position).getTitle(), Toast.LENGTH_SHORT).show(); siteName = siteArrayList.get(position).getTitle(); Site clickedItem = siteArrayList.get(position); - supervisorTextView.setText(null); StorageManager.getInstance().setSite_id(clickedItem.getId()); + supervisorTextView.setText(null); + departmentTextview.setText(null); + buildingTextview.setText(null); + floorTextview.setText(null); + + StorageManager.getInstance().setSupervisorId(0); + StorageManager.getInstance().setDepartmentId(0); + StorageManager.getInstance().setBuildingId(0); + StorageManager.getInstance().setFloorId(0); + + supervisorName = ""; + departmentName = ""; + buildingName = ""; + floorName = ""; + if (!supervisorArrayList_temp.isEmpty()) { List filteredUnitItems = supervisorArrayList_temp.stream() .filter(item -> Objects.equals(item.getSiteId(), clickedItem.getId())) diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/HseReportRequest.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/HseReportRequest.java index 36a2d80..d26098a 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/HseReportRequest.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/HseReportRequest.java @@ -16,6 +16,7 @@ public class HseReportRequest { private int buildingId; private int floorId; private String createdBy; + private String appVersion; private List hseReportRecord; @@ -119,7 +120,15 @@ public class HseReportRequest { this.createdBy = createdBy; } - public HseReportRequest(String observation_date, int userId, int site_id, int supervisorId, String supervisorName, String shift, int recordTypeId, int departmentId, int buildingId, int floorId, String createdBy, List reportData) { + public String getAppVersion() { + return appVersion; + } + + public void setAppVersion(String appVersion) { + this.appVersion = appVersion; + } + + public HseReportRequest(String observation_date, int userId, int site_id, int supervisorId, String supervisorName, String shift, int recordTypeId, int departmentId, int buildingId, int floorId, String createdBy, String appVersion, List reportData) { this.observation_date = observation_date; this.userId = userId; this.siteId = site_id; @@ -131,6 +140,7 @@ public class HseReportRequest { this.buildingId = buildingId; this.floorId = floorId; this.createdBy = createdBy; + this.appVersion = appVersion; this.hseReportRecord = reportData; } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/StorageManager.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/StorageManager.java index 8f95ad6..4ba6aaf 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/StorageManager.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/StorageManager.java @@ -22,6 +22,7 @@ public class StorageManager { private String buildingName; private int floorId; private String floorName; + private String appVersion; private List observationsModel; private List reportActivityModel; @@ -227,6 +228,14 @@ public class StorageManager { this.otherActivityModel = otherActivityModel; } + public String getAppVersion() { + return appVersion; + } + + public void setAppVersion(String appVersion) { + this.appVersion = appVersion; + } + public void clearObservationModule() { if (observationsModel != null) { observationsModel.clear(); diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/viewmodels/LoginViewModel.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/viewmodels/LoginViewModel.java index dcf0299..7925500 100644 --- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/viewmodels/LoginViewModel.java +++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/viewmodels/LoginViewModel.java @@ -153,7 +153,7 @@ public class LoginViewModel extends ViewModel { isLoading.setValue(false); if (response.isSuccessful() && response.body() != null) { - //Log.e("onResponse: ", "Successful"); + Log.e("onResponse-HseData: ", "Successful"); userLiveData.setValue(response.body()); } else { errorLiveData.setValue(response.message());