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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-05-18 17:48:36 +02:00
commit 266b3d707f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -74,7 +74,7 @@ android {
abortOnError false abortOnError false
} }
dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm'] dynamicFeatures = [":dynamic__base"]
} }

1
app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
View File

@ -94,6 +94,7 @@ public class SplashActivity extends BaseActivity {
@Override @Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if(this.onRequestPermissionResult != null) { if(this.onRequestPermissionResult != null) {
List<Integer> grantResultsList = new ArrayList<>(); List<Integer> grantResultsList = new ArrayList<>();
for(int i = 0; i < grantResults.length; i++) { for(int i = 0; i < grantResults.length; i++) {

2
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
View File

@ -103,7 +103,7 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim
dispatchConsegne(); dispatchConsegne();
}); });
this.mViewModel.getDocuments().observe(this, this::refreshList); this.mViewModel.getDocuments().observe(this.getViewLifecycleOwner(), this::refreshList);
openFilterDialog(); openFilterDialog();
} }

3
settings.gradle
View File

@ -1,2 +1 @@
include ':dynamic_gramm' include ':app', ':dynamic_gramm', ':pointmobilescannerlibrary', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis', ':dynamic_saporiveri_pv', ':keyobardemulatorscannerlibrary', ':barcode_base_android_library', ':dynamic_saporiveri'
include ':app', ':pointmobilescannerlibrary', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis', ':dynamic_saporiveri_pv', ':keyobardemulatorscannerlibrary', ':barcode_base_android_library', ':dynamic_saporiveri'