diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2085cbb2..85e8be7f 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 311bfbbb..15cbf8d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 31 - def appVersionName = '1.0.28' + def appVersionCode = 32 + def appVersionName = '1.0.29' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java index 747a5a47..fa7c6552 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java @@ -8,7 +8,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager; public class UtilityFirebase { public static Trace getNewPerformanceTrace(String traceName) { - String username = SettingsManager.i().user.fullname; + String username = SettingsManager.i().user.fullname ; Trace newTrace = FirebasePerformance.getInstance().newTrace(traceName); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 4afbe27c..74327678 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -22,6 +22,7 @@ import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityServer; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.login.core.LoginHelper; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; @@ -119,7 +120,7 @@ public class LoginViewModel { SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles); SettingsManager.i().createUserSession(); - SettingsManager.i().user.fullname = loginDTO.full_name; + SettingsManager.i().user.fullname = !UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get(); mActivity.runOnUiThread(() -> onLoginSuccess( diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index 30149b69..b32464ae 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -82,9 +82,9 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment { } @Override - public void onDetach() { + public void onDestroyView() { BarcodeManager.removeCallback(barcodeScannerIstanceID); - super.onDetach(); + super.onDestroyView(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index b7a9951d..814b4139 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -96,10 +96,10 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme } @Override - public void onDetach() { + public void onDestroyView() { mRettificaGiacenzeViewModel.closeLU(false, false); BarcodeManager.removeCallback(barcodeScannerIstanceID); - super.onDetach(); + super.onDestroyView(); } @Override