From 530bb336bf88103fac89af947259d912cf2f882f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 31 Jan 2019 10:06:32 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Fix=20se=20fullname=20=C3=A8=20nullo.=20Fix?=
 =?UTF-8?q?=20se=20si=20chiude=20il=20fragment=20Rettifica=20o=20Versament?=
 =?UTF-8?q?o=20nel=20caso=20si=20ha=20ancora=20una=20UL=20aperta.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integrywmsnative/core/utility/UtilityFirebase.java        | 2 +-
 .../integrywmsnative/gest/login/viewmodel/LoginViewModel.java | 3 ++-
 .../gest/picking_libero/PickingLiberoFragment.java            | 4 ++--
 .../gest/rettifica_giacenze/RettificaGiacenzeFragment.java    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

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

From 871afdfd7dee9d33acb4f5f368088409888f73b4 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 31 Jan 2019 10:16:13 +0100
Subject: [PATCH 2/2] -> v1.0.29 (32)

---
 .idea/caches/build_file_checksums.ser | Bin 729 -> 729 bytes
 app/build.gradle                      |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2085cbb232623de2477f10076daab99386e0f2a3..85e8be7f667143a2d2ebc326ea1611c8cf1b1b88 100644
GIT binary patch
delta 36
scmcb~dXsg+43@=)J^v=o*(%_^Pu{X7ctiSaJ6;dhpeW<biHsGD04U}ToB#j-

delta 36
ucmV+<0NelB1=$6Vm;|48Vsw$5wGhc2@pKa6w?ZMAfm@=dt824i0eAs9rx1Yv

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 {