Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.41.07(455)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2024-11-18 18:31:48 +01:00
commit 47ff01805c
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 454
def appVersionName = '1.41.06'
def appVersionCode = 455
def appVersionName = '1.41.07'
signingConfigs {
release {

8
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
View File

@ -53,16 +53,16 @@ public class BaseActivity extends AppCompatActivity {
private void openProgress() {
BarcodeManager.disable();
executorService.execute(() -> {
//executorService.execute(() -> {
this.mCurrentProgress.show(getSupportFragmentManager());
});
//});
}
private void closeProgress() {
BarcodeManager.enable();
executorService.execute(() -> {
//executorService.execute(() -> {
mCurrentProgress.dismiss();
});
//});
}
@Override

8
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
View File

@ -77,16 +77,16 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
private void openProgress() {
BarcodeManager.disable();
executorService.execute(() -> {
// executorService.execute(() -> {
this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
});
// });
}
private void closeProgress() {
BarcodeManager.enable();
executorService.execute(() -> {
// executorService.execute(() -> {
mCurrentProgress.dismiss();
});
// });
}

8
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
View File

@ -66,16 +66,16 @@ public abstract class BaseFragment extends Fragment {
private void openProgress() {
BarcodeManager.disable();
executorService.execute(() -> {
// executorService.execute(() -> {
this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
});
// });
}
private void closeProgress() {
BarcodeManager.enable();
executorService.execute(() -> {
// executorService.execute(() -> {
mCurrentProgress.dismiss();
});
// });
}
public void onError(Exception ex) {

8
app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
View File

@ -309,15 +309,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
private void openProgress() {
executorService.execute(() -> {
// executorService.execute(() -> {
this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
});
// });
}
private void closeProgress() {
executorService.execute(() -> {
// executorService.execute(() -> {
mCurrentProgress.dismiss();
});
// });
}

4
app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
View File

@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
}
public void show(@NonNull FragmentManager manager) {
if (!isAdded() && !isInLayout()) {
if (!isAdded() && !isInLayout() && !progressOpened) {
this.progressOpened = true;
super.show(manager, "loading-dialog");
}
@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
@Override
public void dismiss() {
if (isAdded() || isInLayout()) {
if (isAdded() || isInLayout() || progressOpened) {
this.progressOpened = false;
super.dismissAllowingStateLoss();
}