fenix
/
Simple-Voice-Recorder
mirror of https://github.com/SimpleMobileTools/Simple-Voice-Recorder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add handling for deleting real files on Android Q- too

This commit is contained in:
tibbi 2020-04-02 18:06:27 +02:00
parent a25651dc20
commit 36aab3460e
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
View File

@ -7,11 +7,9 @@ import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.extensions.formatDate import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.formatSize
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getFormattedDuration
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isQPlus
import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.voicerecorder.R import com.simplemobiletools.voicerecorder.R
@ -20,6 +18,7 @@ import com.simplemobiletools.voicerecorder.dialogs.RenameRecordingDialog
import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener
import com.simplemobiletools.voicerecorder.models.Recording import com.simplemobiletools.voicerecorder.models.Recording
import kotlinx.android.synthetic.main.item_recording.view.* import kotlinx.android.synthetic.main.item_recording.view.*
import java.io.File
import java.util.* import java.util.*
class RecordingsAdapter( class RecordingsAdapter(
@ -122,11 +121,18 @@ class RecordingsAdapter(
val oldRecordingIndex = recordings.indexOfFirst { it.id == currRecordingId } val oldRecordingIndex = recordings.indexOfFirst { it.id == currRecordingId }
val recordingsToRemove = recordings.filter { selectedKeys.contains(it.id) } as ArrayList<Recording> val recordingsToRemove = recordings.filter { selectedKeys.contains(it.id) } as ArrayList<Recording>
val positions = getSelectedItemPositions() val positions = getSelectedItemPositions()
recordingsToRemove.forEach {
val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) if (isQPlus()) {
val selection = "${MediaStore.Audio.Media._ID} = ?" recordingsToRemove.forEach {
val selectionArgs = arrayOf(it.id.toString()) val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
activity.contentResolver.delete(uri, selection, selectionArgs) val selection = "${MediaStore.Audio.Media._ID} = ?"
val selectionArgs = arrayOf(it.id.toString())
activity.contentResolver.delete(uri, selection, selectionArgs)
}
} else {
recordingsToRemove.forEach {
activity.deleteFile(File(it.path).toFileDirItem(activity))
}
} }
recordings.removeAll(recordingsToRemove) recordings.removeAll(recordingsToRemove)