diff --git a/app/build.gradle b/app/build.gradle index b2b722c9..6f112f2d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 456 - def appVersionName = '1.41.08' + def appVersionCode = 457 + def appVersionName = '1.41.09' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 6843d1b8..cfe305fa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -63,6 +63,8 @@ public class UtilityExceptions { if (!BuildConfig.DEBUG && !toIgnore) { if (sendEmail) UtilityLogger.error(ex); FirebaseCrashlytics.getInstance().recordException(ex); + } else { + ex.printStackTrace(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index fbe5a87c..e10e28c8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -18,7 +18,6 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.sqlite.db.SimpleSQLiteQuery; import com.annimon.stream.Stream; -import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.harrysoft.androidbluetoothserial.BluetoothManager; import java.io.BufferedReader; @@ -45,6 +44,7 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.rest.model.MailAttachmentDTO; import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.view.dialogs.DialogProgressView; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; @@ -293,13 +293,16 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT }); }); } catch (Exception ex) { - requireActivity().runOnUiThread(() -> { - DialogSimpleMessageView - .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null) - .show(requireActivity().getSupportFragmentManager(), "tag"); - }); + UtilityExceptions.defaultException(requireContext(), ex); + this.closeProgress(); - FirebaseCrashlytics.getInstance().recordException(ex); +// requireActivity().runOnUiThread(() -> { +// DialogSimpleMessageView +// .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null) +// .show(requireActivity().getSupportFragmentManager(), "tag"); +// }); +// +// FirebaseCrashlytics.getInstance().recordException(ex); } }); }) @@ -330,6 +333,12 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT String line; while ((line = br.readLine()) != null) { + + if(!line.matches("\\d{13}.*")) { + int lastNewLineChar = text.lastIndexOf("\n"); + text.deleteCharAt(text.length() - 1); + } + text.append(line); text.append('\n'); }