From 3c86db62c0d4700628ae52d7371dd79357bad6a7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 15 Jan 2024 13:34:38 +0100 Subject: [PATCH] Fix per Tuidi --- .idea/deploymentTargetDropDown.xml | 16 ++++++++++ .../core/utility/UtilitySHA1.java | 31 +++++++++++++++++++ .../DocInterniEditFormViewModel.java | 8 ++++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySHA1.java diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c3383..282ee6d0 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -2,6 +2,22 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySHA1.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySHA1.java new file mode 100644 index 00000000..746b9e4e --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySHA1.java @@ -0,0 +1,31 @@ +package it.integry.integrywmsnative.core.utility; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; + +public class UtilitySHA1 { + + + public static String getSha1Hex(String clearString) + { + try + { + MessageDigest messageDigest = MessageDigest.getInstance("SHA-1"); + messageDigest.update(clearString.getBytes(StandardCharsets.UTF_8)); + byte[] bytes = messageDigest.digest(); + StringBuilder buffer = new StringBuilder(); + for (byte b : bytes) + { + buffer.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1)); + } + return buffer.toString(); + } + catch (Exception ignored) + { + ignored.printStackTrace(); + return null; + } + } + + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index b96a38e6..2b55bb45 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -22,8 +22,10 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityDate; +import it.integry.integrywmsnative.core.utility.UtilitySHA1; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.CheckFornitoreDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO; @@ -201,8 +203,12 @@ public class DocInterniEditFormViewModel { private SaveDTO getSaveDto() { SqlMtbColt document = this.getDocument(); + + String UUID = SettingsManager.i().getUserSession().getDeviceId() + "-" + document.getId(); + UUID = UtilitySHA1.getSha1Hex(UUID); + SaveDTO saveDTO = new SaveDTO(); - saveDTO.setUUID(String.valueOf(document.getId())); + saveDTO.setUUID(UUID); saveDTO.setIdDisp("1"); saveDTO.setGestione(document.getGestione()); saveDTO.setCodMdep(document.getCodMdep());