Skip to content

Commit 5ba36f4

Browse files
committed
DEL not necessary android manifest permissions #40
1 parent 42e68c9 commit 5ba36f4

File tree

2 files changed

+17
-34
lines changed

2 files changed

+17
-34
lines changed

core/src/main/AndroidManifest.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
1+
<manifest xmlns:tools="http://schemas.android.com/tools"
32
tools:ignore="ExtraText">
43

5-
<!-- Required only if your app targets Android 13. -->
6-
<!-- Declare one or more the following permissions only if your app needs
7-
to access data thats protected by them. -->
8-
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
9-
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
10-
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
11-
12-
<!-- Required to maintain app compatibility. -->
13-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
14-
android:maxSdkVersion="32" />
15-
16-
/
174
</manifest>

core/src/main/java/de/raphaelebner/roomdatabasebackup/core/RoomBackup.kt

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package de.raphaelebner.roomdatabasebackup.core
22

3-
import android.Manifest.permission.*
43
import android.app.Activity
54
import android.content.Context
65
import android.content.Intent
@@ -16,12 +15,19 @@ import androidx.security.crypto.EncryptedSharedPreferences
1615
import androidx.security.crypto.MasterKey
1716
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1817
import com.google.common.io.Files.copy
19-
import java.io.*
20-
import java.text.SimpleDateFormat
21-
import java.util.*
22-
import javax.crypto.BadPaddingException
2318
import kotlinx.coroutines.runBlocking
2419
import org.apache.commons.io.comparator.LastModifiedFileComparator
20+
import java.io.BufferedOutputStream
21+
import java.io.File
22+
import java.io.FileOutputStream
23+
import java.io.IOException
24+
import java.io.InputStream
25+
import java.io.OutputStream
26+
import java.text.SimpleDateFormat
27+
import java.util.Arrays
28+
import java.util.Calendar
29+
import java.util.Locale
30+
import javax.crypto.BadPaddingException
2531

2632
/**
2733
* MIT License
@@ -302,7 +308,9 @@ class RoomBackup(var context: Context) {
302308
try {
303309
INTERNAL_BACKUP_PATH.mkdirs()
304310
TEMP_BACKUP_PATH.mkdirs()
305-
} catch (e: FileAlreadyExistsException) {} catch (e: IOException) {}
311+
} catch (_: FileAlreadyExistsException) {
312+
} catch (_: IOException) {
313+
}
306314

307315
if (enableLogDebug) {
308316
Log.d(TAG, "DatabaseName: $dbName")
@@ -359,13 +367,7 @@ class RoomBackup(var context: Context) {
359367
}
360368
BACKUP_FILE_LOCATION_CUSTOM_DIALOG -> {
361369
backupFilename = filename
362-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
363-
permissionRequestLauncher.launch(
364-
arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_AUDIO, READ_MEDIA_VIDEO)
365-
)
366-
} else {
367-
permissionRequestLauncher.launch(arrayOf(READ_EXTERNAL_STORAGE))
368-
}
370+
permissionRequestLauncher.launch(arrayOf())
369371
return
370372
}
371373
BACKUP_FILE_LOCATION_CUSTOM_FILE -> {
@@ -496,13 +498,7 @@ class RoomBackup(var context: Context) {
496498
backupDirectory = File("$EXTERNAL_BACKUP_PATH/")
497499
}
498500
BACKUP_FILE_LOCATION_CUSTOM_DIALOG -> {
499-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
500-
permissionRequestLauncher.launch(
501-
arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_AUDIO, READ_MEDIA_VIDEO)
502-
)
503-
} else {
504-
permissionRequestLauncher.launch(arrayOf(READ_EXTERNAL_STORAGE))
505-
}
501+
permissionRequestLauncher.launch(arrayOf())
506502
return
507503
}
508504
BACKUP_FILE_LOCATION_CUSTOM_FILE -> {

0 commit comments

Comments
 (0)