From bc814a401ebde5ff67c2da8c8841897e918dbf26 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Wed, 25 Jan 2023 15:34:19 +0200 Subject: [PATCH 1/7] =?UTF-8?q?=C3=84dded=20android=2013=20SDK=2033=20perm?= =?UTF-8?q?ision=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ScanDemoExample/app/build.gradle | 4 +-- .../app/src/main/AndroidManifest.xml | 5 ++-- .../gradle/wrapper/gradle-wrapper.properties | 6 ++--- ScanDemoExample/scanlibrary/build.gradle | 4 +-- .../scanlibrary/src/main/AndroidManifest.xml | 5 ++-- .../java/com/scanlibrary/ScanActivity.java | 25 ++++++++++--------- 6 files changed, 26 insertions(+), 23 deletions(-) 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..152e842 100644 --- a/ScanDemoExample/app/src/main/AndroidManifest.xml +++ b/ScanDemoExample/app/src/main/AndroidManifest.xml @@ -3,8 +3,9 @@ package="com.scanner.demo" > - - + + - - + + = 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) { From 8de74818ef55dc0f479fe6ac1d7e46845b125d75 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Wed, 25 Jan 2023 15:50:19 +0200 Subject: [PATCH 2/7] Testing if if statement is issue --- .../src/main/java/com/scanlibrary/ScanActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java index 5929ce2..0e230a8 100644 --- a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java +++ b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java @@ -27,11 +27,11 @@ public class ScanActivity extends Activity implements IScanner, ComponentCallbac protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Build.VERSION.SDK_INT >= 33) { +// if (Build.VERSION.SDK_INT >= 33) { permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; - } else { - permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; - } +// } else { +// permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; +// } permissions[1] = Manifest.permission.CAMERA; setContentView(R.layout.scan_layout); From 270ed142c4e0fedbe8d11aebbc7f43d520928666 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Wed, 25 Jan 2023 15:52:56 +0200 Subject: [PATCH 3/7] Some more tests --- .../scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java index 0e230a8..222370a 100644 --- a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java +++ b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java @@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) { // } else { // permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; // } - permissions[1] = Manifest.permission.CAMERA; + permissions[1] = Manifest.permission.READ_MEDIA_IMAGES; setContentView(R.layout.scan_layout); if(getActionBar() != null){ From 9327fd8b00a197021c7bb3d5f39cb1f2dcc328d2 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Wed, 25 Jan 2023 15:55:53 +0200 Subject: [PATCH 4/7] added if statement back in --- .../src/main/java/com/scanlibrary/ScanActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java index 222370a..5929ce2 100644 --- a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java +++ b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java @@ -27,12 +27,12 @@ public class ScanActivity extends Activity implements IScanner, ComponentCallbac protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -// if (Build.VERSION.SDK_INT >= 33) { + if (Build.VERSION.SDK_INT >= 33) { permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; -// } else { -// permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; -// } - permissions[1] = 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){ From ac876a929416269d86630da84c7a492a7e43e509 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Thu, 26 Jan 2023 10:32:48 +0200 Subject: [PATCH 5/7] Testing permision --- .../scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java index 5929ce2..dc38eb6 100644 --- a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java +++ b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { if (Build.VERSION.SDK_INT >= 33) { permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; } else { - permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; + permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; } permissions[1] = Manifest.permission.CAMERA; From 36aeae78996bef21c2eda9f42305f142a33ad621 Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Thu, 26 Jan 2023 10:40:53 +0200 Subject: [PATCH 6/7] Testing --- .../scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java index dc38eb6..5929ce2 100644 --- a/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java +++ b/ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { if (Build.VERSION.SDK_INT >= 33) { permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; } else { - permissions[0] = Manifest.permission.READ_MEDIA_IMAGES; + permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE; } permissions[1] = Manifest.permission.CAMERA; From 27c6cfa7c60996d8521538095b0edabca65a2cef Mon Sep 17 00:00:00 2001 From: Igee Theron Date: Thu, 26 Jan 2023 11:25:58 +0200 Subject: [PATCH 7/7] Build successfull --- ScanDemoExample/app/src/main/AndroidManifest.xml | 3 ++- ScanDemoExample/build.gradle | 6 +++--- ScanDemoExample/scanlibrary/build.gradle | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ScanDemoExample/app/src/main/AndroidManifest.xml b/ScanDemoExample/app/src/main/AndroidManifest.xml index 152e842..7406fee 100644 --- a/ScanDemoExample/app/src/main/AndroidManifest.xml +++ b/ScanDemoExample/app/src/main/AndroidManifest.xml @@ -14,7 +14,8 @@ android:theme="@style/AppTheme" > + 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/scanlibrary/build.gradle b/ScanDemoExample/scanlibrary/build.gradle index 91a5850..e97cd89 100644 --- a/ScanDemoExample/scanlibrary/build.gradle +++ b/ScanDemoExample/scanlibrary/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 33