Finish v1.47.17(530)
All checks were successful
WMS - Android (New)/pipeline/head This commit looks good

This commit is contained in:
Giuseppe Scorrano 2025-09-16 17:41:52 +02:00
commit 5f1b7ef4a4
5 changed files with 21 additions and 6 deletions

View File

@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 529
def appVersionName = '1.47.16'
def appVersionCode = 530
def appVersionName = '1.47.17'
signingConfigs {
release {

View File

@ -89,7 +89,21 @@ public class AppContext {
private void initLogger() {
Logger.addLogAdapter(new AndroidLogAdapter());
logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
File dataDir = mApplicationContext.getExternalFilesDir(null);
logsFolder = new File(dataDir, "logs");
if (!logsFolder.exists())
logsFolder.mkdirs();
//Temporary clean
File[] wrongFilesToBeDeleted = dataDir.listFiles((file, s) -> s.startsWith("logs_"));
if (wrongFilesToBeDeleted != null)
for (File fileToDelete : wrongFilesToBeDeleted) {
fileToDelete.delete();
}
removeOldLogs(logsFolder);
int maxBytesSize = 5 * 1024 * 1024;

View File

@ -270,7 +270,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
File logFilePath = appContext.getLogFilePath();
var files = logFilePath.listFiles();
var files = logFilePath.listFiles(File::isFile);
var fileToShare = Arrays.stream(files)
.sorted(Comparator.reverseOrder())

View File

@ -855,11 +855,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public void closeOrder() {
this.fabPopupMenu.dismiss();
this.onLoadingStarted();
executorService.execute(() -> {
try {
this.mViewmodel.closeOrder();
this.onLoadingEnded();
} catch (Exception e) {
onError(e);
}

View File

@ -2127,7 +2127,10 @@ public class SpedizioneViewModel {
if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
var printRequestResult = this.sendOnCloseOrderPrintRequest();
this.sendOnLoadingStarted();
this.onCloseOrderPrintRequested(printRequestResult);
this.sendOnLoadingEnded();
}
if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {