diff --git a/ScanDemoExample/app/build.gradle b/ScanDemoExample/app/build.gradle index 100a437..43ae213 100644 --- a/ScanDemoExample/app/build.gradle +++ b/ScanDemoExample/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion "28.0.3" ndkVersion "21.1.6352462" defaultConfig { applicationId "com.scanner.demo" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" } diff --git a/ScanDemoExample/app/src/main/AndroidManifest.xml b/ScanDemoExample/app/src/main/AndroidManifest.xml index e21cf35..7406fee 100644 --- a/ScanDemoExample/app/src/main/AndroidManifest.xml +++ b/ScanDemoExample/app/src/main/AndroidManifest.xml @@ -3,8 +3,9 @@ package="com.scanner.demo" > - - + + + android:label="@string/app_name" + android:exported="true"> diff --git a/ScanDemoExample/build.gradle b/ScanDemoExample/build.gradle index 2a7553f..ac0936a 100644 --- a/ScanDemoExample/build.gradle +++ b/ScanDemoExample/build.gradle @@ -3,10 +3,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url 'https://jitpack.io' } diff --git a/ScanDemoExample/gradle/wrapper/gradle-wrapper.properties b/ScanDemoExample/gradle/wrapper/gradle-wrapper.properties index 85dbf72..bf01e94 100644 --- a/ScanDemoExample/gradle/wrapper/gradle-wrapper.properties +++ b/ScanDemoExample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 28 20:29:58 IST 2020 +#Wed Jan 25 11:26:01 CAT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/ScanDemoExample/scanlibrary/build.gradle b/ScanDemoExample/scanlibrary/build.gradle index 6ef7157..e97cd89 100644 --- a/ScanDemoExample/scanlibrary/build.gradle +++ b/ScanDemoExample/scanlibrary/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion "29.0.3" ndkVersion "21.1.6352462" @@ -14,7 +13,7 @@ android { defaultConfig { minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" ndk diff --git a/ScanDemoExample/scanlibrary/src/main/AndroidManifest.xml b/ScanDemoExample/scanlibrary/src/main/AndroidManifest.xml index 58e2047..225c0cb 100644 --- a/ScanDemoExample/scanlibrary/src/main/AndroidManifest.xml +++ b/ScanDemoExample/scanlibrary/src/main/AndroidManifest.xml @@ -7,8 +7,9 @@ android:required="true" /> - - + + = 33) { + permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; + } else { + permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; + } + permissions[1] = Manifest.permission.CAMERA; + setContentView(R.layout.scan_layout); if(getActionBar() != null){ getActionBar().hide(); @@ -39,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { checkPermissions(); } - private boolean checkPermissions() { + private void checkPermissions() { List listPermissionsNeeded = new ArrayList<>(); for (String p : permissions) { int result = ContextCompat.checkSelfPermission(this, p); @@ -49,14 +51,13 @@ private boolean checkPermissions() { } if (!listPermissionsNeeded.isEmpty()) { ActivityCompat.requestPermissions(this, listPermissionsNeeded.toArray(new String[listPermissionsNeeded.size()]), 100); - return false; + return; } init(); - return true; } @Override - public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { if (requestCode == 100) { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {