From 3a52424ccd24ac55005f818c7ef4314813e098a4 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 1 Oct 2020 10:14:49 +0200 Subject: [PATCH 1/6] Modificata chiave di compilazione. Modificata jre in gradle.properties. --- Integry.jks | Bin 2228 -> 4414 bytes gradle.properties | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Integry.jks b/Integry.jks index 1b30e196208d541dd83fa87fab1606ea45a86fae..672a11ed8b68cfe12dd35fa9226d1ac4fb7a4e0b 100644 GIT binary patch delta 2124 zcmb7EX*iS%1D$s^+YD;#jF4;--t1FcT;vLMQ3)ZpF^wfMh(Shb7+Vt8G7&MBAz8CT zD*F;9WQYbS$r33|W&8S`@BaG!-5=-2IX}*Mo^zh()bDFkqVBHlu0kLX=sy4;f`Md$ z50Rqa=S_h?fRHf)#TNoWK*3n}E+~u?#32DVpaIeG|hR+)FoOytBExKr;jw<_8`(wk?WEt1%y@C#Yh)|b;65^EKshCg}?P%J0*nk7%oRn=C$MEP=z3Q~;ya}cMnVY3<4 zGwAvv)B~7fBmER3O}VaI*tImOJbL&h&Sy<~cHXV+dc#xuP2#27(JlV9OG~|D_#jUi zdR@~>RpQBRtc!)ARERulW+}Z)T`;9`t?bRVereVBaFf%sUp~CtVXDZp>MullJ9Bs> zK{O{PTl*meNuPe0$SzMSBG@Y>Df>%w$@Zr-X4aeGhiTO_lBZv~6%A3Bp-hN8#)Fh3 zNsiCWzh&%fbGNp4-ziJ5@z#fFDYzJAH-*Q0%(c7mrqk}cQ7t_v&2+S%BdZjmKJ`0N zO1#}kMWPgY)|q2A^xjYyD`u4+e(>a@*{PH}YAk7)nK(`9Fy#9)g9L6Oy_MIH`Ndvi zEOPrq&$M)(qnj#*<3!D0flBn+k12-!P3R*#?%zL#X*H)E9uXg2u=lzszDe};gmh`E zj)%P}{V>^2)FqfIJ=vO=+}}L4#r|9|Vr3U<#eMhsK*RF(bT3o9jCl1qskoMRtv%M1 zV+4+be*Va4v;LzA47p_1*H+(wKYgh5>y5k&X$w%+4c76|TbnB5K$zZMUb^+#f71dZ zR5M?AbFmWjMc2de(7aMx%}+PcQ%$!^3JoITLT!$F?k9OU(w0yvIkLN}2rtjV?}0zw zO6uKv=U&%-?<|kat(b(Xya;3F;1yJRI*@&XP8s@vUtaMCVvcRiNA5n=29xb+=;uMo z7iG80r5WHjOpN+ScCX4FFqGL#c(~+$OWIF~+Ax#+=+v;DxIBMSL}65@XM|HK?jhY- zh`-bGbp4KPj_U%3Jj^q&p{3?q+g@xD>2#Iq3$9EFlG0S*OqR)2&E0>kOb+#PMZwco z_=}U4ZUkMMC!$`;Et}v!hXvczBMfbA=4=DA`<-1h6{y+?bj;B)b~GnIk>Py^v^&PBz17#6$Z_(1njnGF21t>bug_Oje_buRiU> zhUE7N0SBm`S4jr>LS+F2ZK4nr2RSD@)1$Ym%e>GJ_8hf3WojI9LTW5 z(((kZK7MCeaNF^A*AGX(v<_?1Pvw>%#3!ozvC*%8D)Z%NYaHvu=x9+4v_I#wgdnE= zs2_VG+zr!!Kx~{U?ZI!jF?F{q4{%dV#Q9Ag?}N4QEvp{pPG?@Wmt4=K;sE3%B^}?i zR9>mnA~U-F+F|%i{WB}8@d#mPP76YCfp9RU5UXr=_4MI!lBkSWJ)mSVw%s`Zt+@nK zMD{+8+;b5XVo$3RfN;8hdV(bd{<6ZZB;cO(kuvn=onEQV-X7(O=%HU< z2|y6%wDdtd1OjshV__~}EY!RJ1_hu{xT)RrF%XRu(1`mZj)w*SAp`_;PoF{P*o*!; zP}mu`AcoH-AjJC;nQ}x5l=!a#!-&{>1qb_F4pguYBzyb&`+)M2XdMv5>lht50vhNT zxk{q-e#PnN{6qiei2E0g=@v*uYC)ah8SjSPPtO&LBoC!y+JyF*y}72oxT{8n;vzYE z2{&15L_C(Us^2^j-9IzVJ54qQEINKnG6`ECy3zk>;=tmEd?_|_e?@#0e= zg`93Nu)q?CH;Jwjz~A|;qmq>!pqpprXqnf#u~m3LYprauwB(euRE#j~8Q#KSiWKuL z`mARPK}}ipFArgkB)3jsUB8L0rH`@_Ka^8tDop5h6YjXE!V2)?Ioj4~353XPT%e~h zNk#{O<`S*_fv+5OlJlwcwon)V0g4pC10eQS^H^cH1YB%&(^u%5vBAmRc-u&YXhdPE z{K(G#EeMMR0LYc@yLW~Rby2|}j-&1~_(pA@RyhePT)l2gdpo=o}!y?(`i;(!U2(NN|DmZ)t=c|5wGv9w|P!cjDft*@)}cD>s| zUzFKY34l1PBrUULno~n_$18A~D^bEFHZXk%7w-Ic!br<5u5PeFp$fCJ$Ty diff --git a/gradle.properties b/gradle.properties index 8cdc8874..9044160d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,6 +35,4 @@ android.enableBuildCache=true # Enable simple gradle caching org.gradle.caching=true # Increase memory allotted to JVM -org.gradle.jvmargs=-Xmx4096m - -org.gradle.java.home=C\:\\Program Files\\Java\\jre1.8.0_202 \ No newline at end of file +org.gradle.jvmargs=-Xmx4096m \ No newline at end of file From 168002316b2387f55914780fab6f01d9241b35ae Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 2 Oct 2020 17:55:18 +0200 Subject: [PATCH 2/6] Resi privati i field di SettingsModel --- .../core/context/AppContext.java | 8 ++--- .../integrywmsnative/core/model/MtbCols.java | 5 ++- .../integrywmsnative/core/model/MtbColt.java | 4 +-- .../core/rest/HttpInterceptor.java | 6 ++-- .../core/rest/RESTBuilder.java | 4 +-- .../rest/consumers/PosizioniRESTConsumer.java | 2 +- .../rest/consumers/SystemRESTConsumer.java | 4 +-- .../rest/watcher/ServerStatusChecker.java | 4 +-- .../core/settings/SettingsManager.java | 8 ++--- .../core/settings/SettingsModel.java | 24 ++++++------- .../core/update/UpdatesManager.java | 4 +-- .../core/utility/UtilityFirebase.java | 6 ++-- .../core/utility/UtilityLogger.java | 2 +- .../core/utility/UtilitySettings.java | 4 +-- .../accettazione/core/AccettazioneHelper.java | 2 +- ...oneOrdineAccettazioneInevasoViewModel.java | 6 ++-- .../viewmodel/ContenutoBancaleViewModel.java | 2 +- .../gest/login/viewmodel/LoginViewModel.java | 34 +++++++++---------- .../gest/main/MainFragment.java | 4 +-- .../PickingLiberoViewModel.java | 2 +- .../picking_resi/PickingResiActivity.java | 4 +-- .../ProdOrdineProduzioneElencoFragment.java | 21 ++++-------- .../core/OrdineProduzioneHelper.java | 2 +- .../core/ProdOrdineLavorazioneHelper.java | 4 +-- .../ProdRecuperoMaterialeViewModel.java | 2 +- .../RettificaGiacenzeViewModel.java | 2 +- .../gest/spedizione/SpedizioneModule.java | 4 --- .../UltimeConsegneClienteViewModel.java | 2 +- .../core/UltimiArriviFornitoreViewModel.java | 2 +- .../vendita/core/MainListVenditaAdapter.java | 4 ++- .../gest/vendita/core/VenditaHelper.java | 8 ++--- .../viewmodel/VersamentoMerceViewModel.java | 4 +-- .../extensions/OrdiniVendita.java | 2 +- 33 files changed, 93 insertions(+), 103 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index ee590adb..b00b35f3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -50,11 +50,11 @@ public class AppContext { FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); if( SettingsManager.isInstanceAvailable() && - (SettingsManager.i().userSession != null && !UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB)) && - (SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname))) { + (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) && + (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) { - crashlytics.setUserId(SettingsManager.i().user.fullname); - crashlytics.setCustomKey("profile_db", SettingsManager.i().userSession.profileDB); + crashlytics.setUserId(SettingsManager.i().getUser().getFullname()); + crashlytics.setCustomKey("profile_db", SettingsManager.i().getUserSession().getProfileDB()); } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java index 7704c36c..25f96b0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.core.model; -import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.settings.SettingsManager; @@ -21,8 +20,8 @@ public class MtbCols extends EntityBase { public MtbCols() { type = "mtb_cols"; - setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); - setModificatoDa(SettingsManager.i().user.fullname); + setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); + setModificatoDa(SettingsManager.i().getUser().getFullname()); setDataMove(UtilityDate.getDateInstance()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 32624df3..9ec32850 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -101,8 +101,8 @@ public class MtbColt extends EntityBase { } public MtbColt initDefaultFields() { - setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); - setPreparatoDa(SettingsManager.i().user.fullname); + setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); + setPreparatoDa(SettingsManager.i().getUser().getFullname()); setOraInizPrep(UtilityDate.getDateInstance()); setCodAnag(SettingsManager.iDB().getDefaultCodAnag()); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index bebc2ee8..bf145ddd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -19,9 +19,9 @@ public class HttpInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { - final String PROFILE_DB = SettingsManager.i().userSession == null ? null : SettingsManager.i().userSession.profileDB; - final String USERNAME = SettingsManager.i().user.username; - final String PASSWORD = SettingsManager.i().user.password; + final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB(); + final String USERNAME = SettingsManager.i().getUser().getUsername(); + final String PASSWORD = SettingsManager.i().getUser().getPassword(); final Request request = chain.request(); final HttpUrl url = request.url().newBuilder() diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java index 4d34814d..71191792 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java @@ -20,12 +20,12 @@ public class RESTBuilder { public static T getService(final Class service) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true); + return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true); } public static T getService(final Class service, int timeout) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout); + return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java index c2200dd7..9309145a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java @@ -21,7 +21,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{ public static void getAvailablePosizioni(RunnableArgs> onComplete, RunnableArgs onFailed) { - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class); posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java index 5feaf24e..e84640f4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java @@ -92,7 +92,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public static void getAvailableProfiles(final ISimpleOperationCallback> callback){ SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class); - service.getAvailableProfiles(SettingsManager.i().user.username, SettingsManager.i().user.password).enqueue(new Callback>>() { + service.getAvailableProfiles(SettingsManager.i().getUser().getUsername(), SettingsManager.i().getUser().getPassword()).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "ProfilesAvailable", callback); @@ -139,7 +139,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public static void sendErrorLogMail(String message, Runnable onComplete, RunnableArgs onFailed) { - String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : " [" + SettingsManager.i().userSession.profileDB + "]"; + String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : " [" + SettingsManager.i().getUserSession().getProfileDB() + "]"; String dest = ""; if(BuildConfig.DEBUG) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java index 2c40d281..9f0071ab 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java @@ -30,8 +30,8 @@ public class ServerStatusChecker { private Runnable runnableCode = new Runnable() { @Override public void run() { - if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().server.host)) { - UtilityServer.isEmsApiAvailable(SettingsManager.i().server.host, SettingsManager.i().server.port, mInternalCallback); + if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) { + UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback); handler.postDelayed(this, MILLIS_DELAY); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e77fe151..d69a26db 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -38,7 +38,7 @@ public class SettingsManager { if(settingsModelIstance == null) { settingsModelIstance = new SettingsModel(); - settingsModelIstance.server = new SettingsModel.Server(); + settingsModelIstance.setServer(new SettingsModel.Server()); //settingsModelIstance.user = new SettingsModel.User(); //settingsModelIstance.userSession = new SettingsModel.UserSession(); @@ -136,10 +136,10 @@ public class SettingsManager { boolean codMdepExistsAnymore = false; - if(settingsModelIstance.userSession.depo != null){ + if(settingsModelIstance.getUserSession().getDepo() != null){ for(AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps){ //Controllo se il codMdep salvato esiste ancora - if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.userSession.depo.getCodMdep())) { + if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) { codMdepExistsAnymore = true; break; } @@ -147,7 +147,7 @@ public class SettingsManager { } if(!codMdepExistsAnymore){ - settingsModelIstance.userSession.depo = availableCodMdeps.get(0); + settingsModelIstance.getUserSession().setDepo(availableCodMdeps.get(0)); } if(onComplete != null) onComplete.run(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java index 03c8554c..cf6fafe1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java @@ -4,9 +4,9 @@ import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; public class SettingsModel { - public Server server; - public User user; - public UserSession userSession; + private Server server; + private User user; + private UserSession userSession; public boolean isUserLoggedIn() { return user != null; @@ -19,9 +19,9 @@ public class SettingsModel { public static class Server { - public String codAzienda; - public String host; - public int port; + private String codAzienda; + private String host; + private int port; public String getCodAzienda() { return codAzienda; @@ -52,9 +52,9 @@ public class SettingsModel { } public static class User { - public String username; - public String password; - public String fullname; + private String username; + private String password; + private String fullname; public String getUsername() { return username; @@ -85,9 +85,9 @@ public class SettingsModel { } public static class UserSession { - public String profileDB; - public AvailableCodMdepsDTO depo; - public Integer defaultOrdinamentoPickingAccettazione = 0; + private String profileDB; + private AvailableCodMdepsDTO depo; + private Integer defaultOrdinamentoPickingAccettazione = 0; public String getProfileDB() { return profileDB; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java index c3d4f623..bb05ffbb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java @@ -36,8 +36,8 @@ public class UpdatesManager { suffix = ""; } - String currentVersionUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/currentVersion"; - String currentDownloadUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/android-release"+suffix+"_v2.apk"; + String currentVersionUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/currentVersion"; + String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release"+suffix+"_v2.apk"; AppUpdater appUpdater = new AppUpdater(context) 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 6593b960..7f81106e 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,14 +8,14 @@ import it.integry.integrywmsnative.core.settings.SettingsManager; public class UtilityFirebase { public static Trace getNewPerformanceTrace(String traceName) { - String username = SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname) ? - SettingsManager.i().user.fullname : + String username = SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()) ? + SettingsManager.i().getUser().getFullname() : "N / A"; Trace newTrace = FirebasePerformance.getInstance().newTrace(traceName); newTrace.putAttribute("user_fullame", username); - newTrace.putAttribute("profile_db", SettingsManager.i().userSession.profileDB); + newTrace.putAttribute("profile_db", SettingsManager.i().getUserSession().getProfileDB()); return newTrace; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index dc478f3c..061befef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -73,7 +73,7 @@ public class UtilityLogger { // // message = message.replace("__ERROR_STACKTRACE__", sw.toString()); // -// String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB; +// String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : SettingsManager.i().getUserSession().getProfileDB(); // message = message.replace("__CUSTOMER_NAME__", currentAzienda); // // message = message.replace("__ERROR_DATE__", UtilityDate.formatDate(UtilityDate.getDateInstance(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java index 0f5a9ec4..1c12f951 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java @@ -7,8 +7,8 @@ public class UtilitySettings { public static void logout(AppDatabase appDatabase){ - SettingsManager.i().user = null; - SettingsManager.i().userSession = null; + SettingsManager.i().setUser(null); + SettingsManager.i().setUserSession(null); UtilityThread.executeParallel(appDatabase::clearAllTables); SettingsManager.update(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index a80b0839..bb9c546c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -35,7 +35,7 @@ public class AccettazioneHelper { } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); service.listOrdiniInevasi(codMdep, "A").enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 96e830da..d85b75f5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -88,7 +88,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC private void init() { - currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione); + currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().getUserSession().getDefaultOrdinamentoPickingAccettazione()); mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this); mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(this::onRowDeleted); @@ -412,7 +412,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC .setTitle(mActivity.getText(R.string.action_orderBy)) .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, currentOrderBy.getVal(), (dialog12, which) -> { currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which); - SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione = which; + SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which); }) .setPositiveButton("Ok", (dialog1, which) -> refreshOrderBy(false)) .create(); @@ -592,7 +592,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC return; } - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, value -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, value -> { if (value.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index b23aea4f..53657ef2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -100,7 +100,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked mContext.bindings.contenutoBancaleFab.close(true); final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, value -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), mPrinterType, value -> { if(value.size() > 0) { 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 c090af84..91b797c0 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 @@ -1,25 +1,25 @@ package it.integry.integrywmsnative.gest.login.viewmodel; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.Intent; -import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.text.SpannableString; import android.text.Spanned; +import androidx.appcompat.app.AlertDialog; + import java.net.MalformedURLException; import java.net.URL; import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableString; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityServer; @@ -59,10 +59,10 @@ public class LoginViewModel { loginButtonEnabled.set(true); - codAzienda.set(SettingsManager.i().server.codAzienda); + codAzienda.set(SettingsManager.i().getServer().getCodAzienda()); - customSettingsCheckboxChecked.set(SettingsManager.i().server.host == null); - customSettingsCheckboxEnabled.set(SettingsManager.i().server.host != null); + customSettingsCheckboxChecked.set(SettingsManager.i().getServer().getHost() == null); + customSettingsCheckboxEnabled.set(SettingsManager.i().getServer().getHost() != null); } @@ -120,7 +120,7 @@ public class LoginViewModel { SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles); SettingsManager.i().createUserSession(); - SettingsManager.i().user.fullname = !UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get(); + SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get()); mActivity.runOnUiThread(() -> onLoginSuccess( @@ -157,12 +157,12 @@ public class LoginViewModel { private void loadDepo(String host, int port, Runnable onComplete) { - SettingsManager.i().server.codAzienda = codAzienda.get(); - SettingsManager.i().server.host = host; - SettingsManager.i().server.port = port; + SettingsManager.i().getServer().setCodAzienda(codAzienda.get()); + SettingsManager.i().getServer().setHost(host); + SettingsManager.i().getServer().setPort(port); - SettingsManager.i().user.username = username.get(); - SettingsManager.i().user.password = password.get(); + SettingsManager.i().getUser().setUsername(username.get()); + SettingsManager.i().getUser().setPassword(password.get()); SystemRESTConsumer.getAvailableCodMdeps(new ISimpleOperationCallback>() { @Override @@ -174,7 +174,7 @@ public class LoginViewModel { return; } - SettingsManager.i().userSession.depo = availableCodMdeps.get(0); + SettingsManager.i().getUserSession().setDepo(availableCodMdeps.get(0)); if(onComplete != null) onComplete.run(); @@ -212,7 +212,7 @@ public class LoginViewModel { private void showProfileDBSelectionDialog(final String host, final int port, final List availableProfiles){ if(availableProfiles != null && availableProfiles.size() == 1 ) { - SettingsManager.i().userSession.profileDB = availableProfiles.get(0); + SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(0)); loadDepo(host, port, this::onLoginCompleted); } else { @@ -225,7 +225,7 @@ public class LoginViewModel { String[] profiles = new String[availableProfiles.size()]; profiles = availableProfiles.toArray(profiles); builder.setItems(profiles, (dialog, which) -> { - SettingsManager.i().userSession.profileDB = availableProfiles.get(which); + SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which)); loadDepo(host, port, this::onLoginCompleted); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 52dfd9b4..0675aef4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -112,8 +112,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab } private void initSessionData() { - mBindings.currentUserName.setText(SettingsManager.i().user.fullname); - mBindings.currentDeposito.setText(String.format("Deposito: %s • %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione())); + mBindings.currentUserName.setText(SettingsManager.i().getUser().getFullname()); + mBindings.currentDeposito.setText(String.format("Deposito: %s • %s", SettingsManager.i().getUserSession().getDepo().getCodMdep(), SettingsManager.i().getUserSession().getDepo().getDescrizione())); if (SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) { // currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index fda8cf1d..3a8cd77d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -644,7 +644,7 @@ public class PickingLiberoViewModel { .setQtaCol(qtaTot) .setPartitaMag(partitaMag) .setDataScadPartita(dataScad) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setCausale(MtbColr.Causale.RETTIFICA) .setDatetimeRow(UtilityDate.getDateInstance()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 30470329..845e1d88 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -215,7 +215,7 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC mtbColt .setGestione(mDefaultGestioneOfUL) .setSegno(mDefaultSegnoOfUL) .setCodAnag(mDefaultCodAnagOfUL) - .setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()) + .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()) .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); @@ -427,7 +427,7 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC DialogAskShouldPrint.make(this, "Packing List", shouldPrint -> { if(shouldPrint) { - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { if (printerList.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 89a51d12..a8110542 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -5,12 +5,6 @@ import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; - -import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; - import android.text.Html; import android.text.SpannableString; import android.view.LayoutInflater; @@ -18,6 +12,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.annimon.stream.Stream; import java.util.ArrayList; @@ -25,12 +24,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; -import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElencoBinding; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; @@ -110,11 +109,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit private void init() { - final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new OrdineProduzioneHelper(getActivity()); - mHelper.loadOrdini(ordini -> { if(ordini != null) { Toast.makeText(getActivity(), "Caricati " + ordini.size() + " ordini", Toast.LENGTH_LONG).show(); @@ -133,8 +130,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); } ); - - } @Override @@ -243,8 +238,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit @Override public void onFilterClick() { - - DialogOrdineProduzioneFiltroAvanzato.make(getActivity(), mOriginalOrderList, mAppliedFilterViewModel, (filteredOrderList, filter) -> { mAppliedFilterViewModel = filter; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java index 485da4fa..c83a21cc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java @@ -29,7 +29,7 @@ public class OrdineProduzioneHelper { mContext = context; } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); service.listOrdiniInevasi(codMdep, "P").enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index 0e879fad..37177c7b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -39,7 +39,7 @@ public class ProdOrdineLavorazioneHelper { } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_ords_lavorazione"); perfTrace.start(); @@ -95,7 +95,7 @@ public class ProdOrdineLavorazioneHelper { // public void retrievePickingList(List orders, RunnableArgs> onComplete, RunnableArgs onFailed){ -// String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); +// String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); // // // Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_lavorazione"); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index 4992573e..77d1d350 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -295,7 +295,7 @@ public class ProdRecuperoMaterialeViewModel { private void printCollo(Dialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { if (printerList.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index a652f014..2c6d3fe8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -577,7 +577,7 @@ public class RettificaGiacenzeViewModel { .setQtaCol(qtaTot) .setPartitaMag(partitaMag) .setDataScadPartita(dataScad) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setCausale(MtbColr.Causale.RETTIFICA) .setDatetimeRow(UtilityDate.getDateInstance()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java index 100a3a9b..1022a23a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.gest.spedizione; -import javax.inject.Singleton; - import dagger.Module; import dagger.Provides; import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; @@ -16,13 +14,11 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag public class SpedizioneModule { @Provides - @Singleton BottomSheetFragmentLUContentViewModel providesBottomSheetFragmentLUContentViewModel() { return new BottomSheetFragmentLUContentViewModel(); } @Provides - @Singleton SpedizioneViewModel providesSpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer) { return new SpedizioneViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliDataRecoverService, ordiniRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index 3a36e6db..4ee6af45 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -92,7 +92,7 @@ public class UltimeConsegneClienteViewModel { } UltimeConsegneClienteRESTConsumer.getUltimeConsegneClienti( - SettingsManager.i().userSession.depo.getCodMdep(), + SettingsManager.i().getUserSession().getDepo().getCodMdep(), currentCodAnagFilter, null, null, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java index edd936b9..ad4787de 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java @@ -110,7 +110,7 @@ public class UltimiArriviFornitoreViewModel { UltimiArriviFornitoreRESTConsumer.getUltimeConsegneFornitori( - SettingsManager.i().userSession.depo.getCodMdep(), + SettingsManager.i().getUserSession().getDepo().getCodMdep(), currentCodAnagFilter, null, null, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java index 6a90c326..67fc0653 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java @@ -141,7 +141,9 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_ords_v"); perfTrace.start(); @@ -88,7 +88,7 @@ public class VenditaHelper { public void retrievePickingList(List barcodeOrdini, String dateCons, RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); String joinedBarcodes = TextUtils.join(",", barcodeOrdini); @@ -133,7 +133,7 @@ public class VenditaHelper { } public void retrievePickingListNew(List orders, RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); List getPickingListDTOs = Stream.of(orders) .map(x -> new GetPickingListDTO() @@ -243,7 +243,7 @@ public class VenditaHelper { testataCollo.getSerCollo(), testataCollo.getGestione(), GestioneEnum.VENDITA.getText(), - SettingsManager.i().userSession.depo.getCodMdep()) + SettingsManager.i().getUserSession().getDepo().getCodMdep()) .enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index e4ae7bfe..2b9040fc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -290,7 +290,7 @@ public class VersamentoMerceViewModel { .setSerColloRif(null) .setDataColloRif((String) null) .setCausale(MtbColr.Causale.VERSAMENTO) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setQtaCol(stornoSourceMtbColr.getQtaCol().multiply(new BigDecimal(-1))); @@ -315,7 +315,7 @@ public class VersamentoMerceViewModel { .setNumCollo(null) .setDataCollo(null) .setCausale(MtbColr.Causale.VERSAMENTO) - .setUtente(SettingsManager.i().user.fullname); + .setUtente(SettingsManager.i().getUser().getFullname()); mtbColrDestObservableField.add(cloneMtbColr); } diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 51651754..fc48124e 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -24,7 +24,7 @@ public class OrdiniVendita implements IOrdiniVendita { //Se il deposito del collo è diverso dal deposito dell'utente allora sto "evadendo" la merce per una vendita presente //su un altro deposito if(!UtilityString.isNullOrEmpty(codMdepOrder) && - !codMdepOrder.equalsIgnoreCase(SettingsManager.i().userSession.depo.getCodMdep())) { + !codMdepOrder.equalsIgnoreCase(SettingsManager.i().getUserSession().getDepo().getCodMdep())) { ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE, From e9cb9954f6cc7bffcbaf38621706fe130397ae70 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 5 Oct 2020 12:21:16 +0200 Subject: [PATCH 3/6] Fix su update posizione di Rettifica Giacenze --- .../integrywmsnative/core/model/MtbColt.java | 2 +- .../RettificaGiacenzeViewModel.java | 2 +- .../gest/spedizione/SpedizioneActivity.java | 29 ++++++- .../DialogAskPositionOfLU.java | 75 ++++--------------- 4 files changed, 43 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 9ec32850..de86c225 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -86,7 +86,7 @@ public class MtbColt extends EntityBase { private ObservableArrayList mtbColr = new ObservableArrayList<>(); public ObservableArrayList getMtbColr() { - return mtbColr; + return mtbColr == null ? new ObservableArrayList<>() : mtbColr; } public MtbColt setMtbColr(ObservableArrayList mtbColr) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index 2c6d3fe8..7716d498 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -447,7 +447,7 @@ public class RettificaGiacenzeViewModel { private void savePosizione(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) { MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone(); - cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); + cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); cloneMtbColt.setMtbColr(null); cloneMtbColt.setPosizione(mtbDepoPosizione != null ? mtbDepoPosizione.getPosizione() : CommonModelConsts.ENTITY_NULL_STRING); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 498725d9..af6b9f61 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -268,13 +268,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo } else { BigDecimal qtaColOrdCounter = x.getSitArtOrdDTO().getQtaOrd(); -// qtaColOrdCounter = qtaColOrdCounter.add(qtaColWithdrawRows.getBigDecimalValue()); + BigDecimal numCnfOrdCounter = x.getSitArtOrdDTO().getNumCnfOrd(); for (MtbColt mtbColtToPick : x.getMtbColts()) { if(UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO)) break; + if(UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO)) + break; + SpedizioneListModel cloneModel = (SpedizioneListModel) spedizioneListModel.clone(); cloneModel.setGroupTitle(String.format("%s: %s", getString(R.string.position_text), UtilityString.isNullOrEmpty(mtbColtToPick.getPosizione()) ? "N.A." : mtbColtToPick.getPosizione())); @@ -289,8 +292,28 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) { cloneModel.setUntMis("col"); - cloneModel.setQtaTot(mtbColrToDispatch != null ? mtbColrToDispatch.getNumCnf() : x.getSitArtOrdDTO().getNumCnfOrd()); - cloneModel.setQtaEvasa(numCnfWithdrawRows.getBigDecimalValue()); +// cloneModel.setQtaTot(mtbColrToDispatch != null ? mtbColrToDispatch.getNumCnf() : x.getSitArtOrdDTO().getNumCnfOrd()); +// cloneModel.setQtaEvasa(numCnfWithdrawRows.getBigDecimalValue()); + + BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter); + + cloneModel.setQtaTot(UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter)); + numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract); + + BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) + .filter(y -> y.getRefMtbColr() != null && + y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) && + y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) && + y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) && + y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) && + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) && + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) && + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())) + .map(MtbColr::getNumCnf) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + cloneModel.setQtaEvasa(qtaEvasa); + } else { BigDecimal qtaOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index 1a9ae416..44f2f38e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -2,11 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu; import android.app.Dialog; import android.content.Context; - -import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; -import com.google.android.material.textfield.TextInputLayout; - import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.text.Editable; @@ -14,11 +9,16 @@ import android.text.TextWatcher; import android.view.LayoutInflater; import android.widget.TextView; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.databinding.DataBindingUtil; + +import com.google.android.material.textfield.TextInputLayout; + import java.util.ArrayList; import java.util.List; +import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -29,10 +29,8 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityPosizione; -import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding; import it.integry.integrywmsnative.view.dialogs.DialogConsts; -import it.integry.barcode_base_android_library.model.BarcodeScanDTO; public class DialogAskPositionOfLU { @@ -143,6 +141,8 @@ public class DialogAskPositionOfLU { if(!completedFlow) onComplete.run(DialogConsts.Results.ABORT, null); }); + BarcodeManager.enable(); + } @@ -162,23 +162,11 @@ public class DialogAskPositionOfLU { askLivello(); BarcodeManager.enable(); } else { - if(mtbColt != null) { - updatePosizione(foundPosizione, () -> { - completedFlow = true; - BarcodeManager.enable(); - if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); - }, ex -> { - completedFlow = true; - BarcodeManager.enable(); - onFailed.run(ex); - }); - } else { - completedFlow = true; - if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); + completedFlow = true; + if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); - mDialog.dismiss(); - BarcodeManager.enable(); - } + mDialog.dismiss(); + BarcodeManager.enable(); } } else { @@ -200,25 +188,9 @@ public class DialogAskPositionOfLU { if(foundPosizione != null) { resetLevelError(); - if(mtbColt != null) { - Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); - - ColliMagazzinoRESTConsumer.changePosizione(mtbColt, foundPosizione, () -> { - progressDialog.dismiss(); - completedFlow = true; - if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); - mDialog.dismiss(); - }, ex -> { - UtilityExceptions.defaultException(mContext, ex, progressDialog); - completedFlow = true; - if(onFailed != null) onFailed.run(ex); - mDialog.dismiss(); - }); - } else { - completedFlow = true; - if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); - mDialog.dismiss(); - } + completedFlow = true; + if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione); + mDialog.dismiss(); } else { setLevelError(mContext.getResources().getString(R.string.not_valid)); @@ -251,21 +223,4 @@ public class DialogAskPositionOfLU { mDialog.dismiss(); } - private void updatePosizione(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete, RunnableArgs onFailed) { - - final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); - - ColliMagazzinoRESTConsumer.changePosizione(mtbColt, mtbDepoPosizione, () -> { - progressDialog.dismiss(); - onComplete.run(); - }, ex -> { - progressDialog.dismiss(); - onFailed.run(ex); - }); - - } - - - - } From 507a38f3a7069e0a137b46cdf185258a3b682cb9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 5 Oct 2020 12:31:08 +0200 Subject: [PATCH 4/6] Fix della UI in Spedizione quando veniva evasa completamente una riga (rimaneva a video la riga con qta 0). --- .../gest/spedizione/SpedizioneActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index af6b9f61..af79ca3e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -297,7 +297,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter); - cloneModel.setQtaTot(UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter)); + BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter); + if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue; + cloneModel.setQtaTot(qtaTot); + numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract); BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) @@ -318,7 +321,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo BigDecimal qtaOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter); - cloneModel.setQtaTot(UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter)); + BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter); + if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue; + cloneModel.setQtaTot(qtaTot); qtaColOrdCounter = qtaColOrdCounter.subtract(qtaOrdToSubstract); BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) From eff50dce039d3ec249336c701e2faee2af366dac Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 5 Oct 2020 12:57:04 +0200 Subject: [PATCH 5/6] Fix: in caso di edit row do un collo recuperato, in Spedizione, l'applicazione si bloccava. --- .../gest/spedizione/SpedizioneActivity.java | 2 -- .../gest/spedizione/SpedizioneViewModel.java | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index af79ca3e..c4de92fd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -292,8 +292,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) { cloneModel.setUntMis("col"); -// cloneModel.setQtaTot(mtbColrToDispatch != null ? mtbColrToDispatch.getNumCnf() : x.getSitArtOrdDTO().getNumCnfOrd()); -// cloneModel.setQtaEvasa(numCnfWithdrawRows.getBigDecimalValue()); BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 82985506..71acec42 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1269,11 +1269,14 @@ public class SpedizioneViewModel { this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> { - PickingObjectDTO pickingObjectDTO = Stream.of(this.mPickingList.getValue()) + Optional pickingObjectDTO = Stream.of(this.mPickingList.getValue()) .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete)) - .single(); + .findSingle(); + + if(pickingObjectDTO.isPresent()) { + pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete); + } - pickingObjectDTO.getWithdrawMtbColrs().remove(mtbColrToDelete); this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete); this.resetMatchedRows(); From 798b869f30829dcee649329d1cac5f50ae222f05 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 5 Oct 2020 13:00:00 +0200 Subject: [PATCH 6/6] -> v1.13.9 (155) --- app/build.gradle | 4 ++-- build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 24b1cc19..ce3ff7df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 154 - def appVersionName = '1.13.8' + def appVersionCode = 155 + def appVersionName = '1.13.9' signingConfigs { release { diff --git a/build.gradle b/build.gradle index e7480acf..30070adf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.3.72' + kotlin_version = '1.4.10' } repositories { @@ -12,11 +12,11 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.google.gms:google-services:4.3.4' classpath 'com.google.firebase:perf-plugin:1.3.1' // Add the Firebase Crashlytics Gradle plugin. - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta02' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files