Skip to content

Commit 717208a

Browse files
Merge pull request MediaArea#845 from g-maxime/android-update-lite
Android GUI: Open files fixes
2 parents fb46989 + 1a0dc9b commit 717208a

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

Source/GUI/Android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
defaultConfig {
1717
applicationId "net.mediaarea.mediainfo"
1818
multiDexEnabled = true
19-
minSdkVersion 14
19+
minSdkVersion 19
2020
versionCode 42
2121
versionName "24.04"
2222
targetSdkVersion 34

Source/GUI/Android/app/src/main/AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<manifest
99
xmlns:android="http://schemas.android.com/apk/res/android">
1010
<uses-permission android:name="com.android.vending.BILLING" />
11-
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
12-
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
13-
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
1411
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
1512
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="20" />
1613

@@ -27,7 +24,6 @@
2724
android:name=".ReportListActivity"
2825
android:label="@string/app_name"
2926
android:theme="@style/AppTheme.NoActionBar"
30-
android:launchMode="singleInstance"
3127
android:configChanges="locale|layoutDirection"
3228
android:exported="true">
3329
<intent-filter>

Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt

+3-13
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,7 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
189189

190190
private fun handleUri(uri: Uri) {
191191
if (uri.scheme == "file") {
192-
if (Build.VERSION.SDK_INT >= 33) {
193-
if (checkSelfPermission(android.Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED ||
194-
checkSelfPermission(android.Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED ||
195-
checkSelfPermission(android.Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED) {
196-
pendingFileUris.add(uri)
197-
ActivityCompat.requestPermissions(this@ReportListActivity,
198-
arrayOf(android.Manifest.permission.READ_MEDIA_IMAGES, android.Manifest.permission.READ_MEDIA_VIDEO, android.Manifest.permission.READ_MEDIA_AUDIO),
199-
READ_EXTERNAL_STORAGE_PERMISSION_REQUEST)
200-
return
201-
}
202-
} else if (Build.VERSION.SDK_INT >= 23) {
192+
if (Build.VERSION.SDK_INT >= 23) {
203193
if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
204194
pendingFileUris.add(uri)
205195
ActivityCompat.requestPermissions(this@ReportListActivity,
@@ -555,8 +545,8 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
555545
reportModel = ViewModelProvider(this, viewModelFactory)[ReportViewModel::class.java]
556546

557547
activityReportListBinding.addButton.setOnClickListener {
558-
if (Build.VERSION.SDK_INT >= 19) {
559-
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
548+
if (Build.VERSION.SDK_INT >= 20) { // Official Android FileChooser is buggy on Android 4.4 (19)
549+
val intent = Intent(Intent.ACTION_GET_CONTENT)
560550

561551
intent.addCategory(Intent.CATEGORY_OPENABLE)
562552
intent.type = "*/*"

0 commit comments

Comments
 (0)