feat: fix required permissions for android < 33

Author: CodeDead

app/build.gradle

@@ -6,9 +6,9 @@ android {
  applicationId "com.codedead.deadhash"
  minSdk 28
  targetSdk 34
- versionName '1.8.1'
+ versionName '1.8.2'
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- versionCode 11
+ versionCode 12
  }
  buildTypes {
  release {

app/src/main/AndroidManifest.xml

@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools">
 
+ <uses-permission
+ android:name="android.permission.READ_EXTERNAL_STORAGE"
+ android:maxSdkVersion="32" />
  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />

app/src/main/java/com/codedead/deadhash/gui/MainActivity.java

@@ -538,29 +538,36 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
  }
 
  private void onClickSelectFile(final View v) {
- if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED
- || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED
- || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED) {
- Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+ if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+ Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
+ ActivityCompat.requestPermissions(MainActivity.this, new String[]{
+ Manifest.permission.READ_EXTERNAL_STORAGE
+ }, 0);
+
+ return;
+ }
+ } else {
+ if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED
+ || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED
+ || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED) {
+ Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
  ActivityCompat.requestPermissions(MainActivity.this, new String[]{
  Manifest.permission.READ_MEDIA_AUDIO,
  Manifest.permission.READ_MEDIA_IMAGES,
  Manifest.permission.READ_MEDIA_VIDEO
  }, 0);
- } else {
- ActivityCompat.requestPermissions(MainActivity.this, new String[]{
- Manifest.permission.READ_EXTERNAL_STORAGE
- }, 0);
- }
- } else {
- final Intent intent = new Intent()
- .setType("*/*")
- .setAction(Intent.ACTION_OPEN_DOCUMENT)
- .addCategory(Intent.CATEGORY_OPENABLE);
 
- activityResultLauncher.launch(Intent.createChooser(intent, getString(R.string.dialog_select_file)));
+ return;
+ }
  }
+
+ final Intent intent = new Intent()
+ .setType("*/*")
+ .setAction(Intent.ACTION_OPEN_DOCUMENT)
+ .addCategory(Intent.CATEGORY_OPENABLE);
+
+ activityResultLauncher.launch(Intent.createChooser(intent, getString(R.string.dialog_select_file)));
  }
 }