diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 51b09c0b..ac46081c 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -30,6 +30,7 @@ pipeline { stage('Build') { steps { bat "./gradlew assembleRelease" + bat "./gradlew app:uploadCrashlyticsSymbolFileRelease" archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true } } diff --git a/app/build.gradle b/app/build.gradle index 219e0fbf..a2fa41a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 523 - def appVersionName = '1.47.10' + def appVersionCode = 524 + def appVersionName = '1.47.11' signingConfigs { release { 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 2b10e613..7243e9a9 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 @@ -39,8 +39,6 @@ public class SettingsManager { private static SettingsModel settingsModelIstance; private static DBSettingsModel dbSettingsModelIstance; - private static boolean firstStart = false; - private static Context mContext; private static SystemRESTConsumer mSystemRESTConsumer; private static ImballiRESTConsumer mImballiRESTConsumer; @@ -65,15 +63,15 @@ public class SettingsManager { public void init() { settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class); - if (settingsModelIstance == null) { + if (settingsModelIstance == null) settingsModelIstance = new SettingsModel(); + + if (settingsModelIstance.getServer() == null) settingsModelIstance.setServer(new SettingsModel.Server()); - firstStart = true; - } + dbSettingsModelIstance = new DBSettingsModel(); - } public SettingsModel getSettings() { @@ -89,10 +87,6 @@ public class SettingsManager { return dbSettingsModelIstance; } - public static boolean isFirstStart() { - return firstStart; - } - public static boolean isInstanceAvailable() { return i() != null; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java index 86e14377..3367e225 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java @@ -21,7 +21,7 @@ public class ProdRientroMerceOrderListFilterViewModel { public void init(List initialList) { this.initialOrderList = initialList; - this.currentFilteredOrderList.setValue(this.initialOrderList); + this.currentFilteredOrderList.postValue(this.initialOrderList); } public MutableLiveData> getMutableFilteredOrderList() {