updating some code style, no functionality changes

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

@@ -1,6 +1,7 @@
 package com.simplemobiletools.voicerecorder.adapters
 
 import android.provider.MediaStore
+import android.provider.MediaStore.Audio.Media
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
@@ -21,10 +22,10 @@ import kotlinx.android.synthetic.main.item_recording.view.*
 import java.io.File
 import java.util.*
 
-class RecordingsAdapter(
+class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Recording>, val refreshListener: RefreshRecordingsListener,
-    activity: SimpleActivity, var recordings: ArrayList<Recording>, val refreshListener: RefreshRecordingsListener,
+                        recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit)
-    recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit
+    : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
-) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
+
     var currRecordingId = 0
 
     init {
@@ -124,8 +125,8 @@ class RecordingsAdapter(
 
         if (isQPlus()) {
             recordingsToRemove.forEach {
-                val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+                val uri = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
-                val selection = "${MediaStore.Audio.Media._ID} = ?"
+                val selection = "${Media._ID} = ?"
                 val selectionArgs = arrayOf(it.id.toString())
                 activity.contentResolver.delete(uri, selection, selectionArgs)
             }

app/src/main/kotlin/com/simplemobiletools/voicerecorder/dialogs/RenameRecordingDialog.kt

@@ -1,7 +1,7 @@
 package com.simplemobiletools.voicerecorder.dialogs
 
 import android.content.ContentValues
-import android.provider.MediaStore
+import android.provider.MediaStore.Audio.Media
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
@@ -59,8 +59,8 @@ class RenameRecordingDialog(val activity: BaseSimpleActivity, val recording: Rec
         val newDisplayName = "${newTitle.removeSuffix(".$oldExtension")}.$oldExtension"
 
         val values = ContentValues().apply {
-            put(MediaStore.Audio.Media.TITLE, newTitle.substringAfterLast('.'))
+            put(Media.TITLE, newTitle.substringAfterLast('.'))
-            put(MediaStore.Audio.Media.DISPLAY_NAME, newDisplayName)
+            put(Media.DISPLAY_NAME, newDisplayName)
         }
 
         activity.contentResolver.update(getAudioFileContentUri(recording.id.toLong()), values, null, null)

app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt

@@ -2,7 +2,6 @@ package com.simplemobiletools.voicerecorder.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.database.Cursor
 import android.graphics.drawable.Drawable
 import android.media.AudioManager
 import android.media.MediaMetadataRetriever
@@ -11,6 +10,7 @@ import android.os.Handler
 import android.os.Looper
 import android.os.PowerManager
 import android.provider.MediaStore
+import android.provider.MediaStore.Audio.Media
 import android.util.AttributeSet
 import android.widget.SeekBar
 import com.simplemobiletools.commons.extensions.*
@@ -165,47 +165,37 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
     private fun getMediaStoreRecordings(): ArrayList<Recording> {
         val recordings = ArrayList<Recording>()
 
-        val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+        val uri = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
         val projection = arrayOf(
-            MediaStore.Audio.Media._ID,
+            Media._ID,
-            MediaStore.Audio.Media.DISPLAY_NAME,
+            Media.DISPLAY_NAME,
-            MediaStore.Audio.Media.DATE_ADDED,
+            Media.DATE_ADDED,
-            MediaStore.Audio.Media.DURATION,
+            Media.DURATION,
-            MediaStore.Audio.Media.SIZE
+            Media.SIZE
         )
 
-        val selection = "${MediaStore.Audio.Media.OWNER_PACKAGE_NAME} = ?"
+        val selection = "${Media.OWNER_PACKAGE_NAME} = ?"
         val selectionArgs = arrayOf(context.packageName)
-        val sorting = "${MediaStore.Audio.Media.DATE_ADDED} DESC"
+        val sortOrder = "${Media.DATE_ADDED} DESC"
 
-        var cursor: Cursor? = null
+        context.queryCursor(uri, projection, selection, selectionArgs, sortOrder, true) { cursor ->
-        try {
+            val id = cursor.getIntValue(Media._ID)
-            cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, sorting)
+            val title = cursor.getStringValue(Media.DISPLAY_NAME)
-            if (cursor?.moveToFirst() == true) {
+            val path = ""
-                do {
+            val timestamp = cursor.getIntValue(Media.DATE_ADDED)
-                    val id = cursor.getIntValue(MediaStore.Audio.Media._ID)
+            var duration = cursor.getLongValue(Media.DURATION) / 1000
-                    val title = cursor.getStringValue(MediaStore.Audio.Media.DISPLAY_NAME)
+            var size = cursor.getIntValue(Media.SIZE)
-                    val path = ""
-                    val timestamp = cursor.getIntValue(MediaStore.Audio.Media.DATE_ADDED)
-                    var duration = cursor.getLongValue(MediaStore.Audio.Media.DURATION) / 1000
-                    var size = cursor.getIntValue(MediaStore.Audio.Media.SIZE)
 
-                    if (duration == 0L) {
+            if (duration == 0L) {
-                        duration = getDurationFromUri(id.toLong())
+                duration = getDurationFromUri(id.toLong())
-                    }
-
-                    if (size == 0) {
-                        size = getSizeFromUri(id.toLong())
-                    }
-
-                    val recording = Recording(id, title, "", timestamp, duration.toInt(), size)
-                    recordings.add(recording)
-                } while (cursor.moveToNext())
             }
-        } catch (e: Exception) {
+
-            context.showErrorToast(e)
+            if (size == 0) {
-        } finally {
+                size = getSizeFromUri(id.toLong())
-            cursor?.close()
+            }
+
+            val recording = Recording(id, title, "", timestamp, duration.toInt(), size)
+            recordings.add(recording)
         }
 
         return recordings

app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.net.Uri
 import android.provider.MediaStore
+import android.provider.MediaStore.Audio.Media
 import com.simplemobiletools.commons.helpers.isQPlus
 
 const val RECORDER_RUNNING_NOTIF_ID = 10000
@@ -19,9 +20,9 @@ const val SAVE_RECORDINGS = "save_recordings"
 @SuppressLint("InlinedApi")
 fun getAudioFileContentUri(id: Long): Uri {
     val baseUri = if (isQPlus()) {
-        MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+        Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
     } else {
-        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+        Media.EXTERNAL_CONTENT_URI
     }
 
     return ContentUris.withAppendedId(baseUri, id)

app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt

@@ -11,6 +11,7 @@ import android.media.MediaScannerConnection
 import android.os.Build
 import android.os.IBinder
 import android.provider.MediaStore
+import android.provider.MediaStore.Audio.Media
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import com.simplemobiletools.commons.extensions.*
@@ -147,13 +148,13 @@ class RecorderService : Service() {
 
     @SuppressLint("InlinedApi")
     private fun addFileInNewMediaStore() {
-        val audioCollection = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+        val audioCollection = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
 
         val storeFilename = currFilePath.getFilenameFromPath()
         val newSongDetails = ContentValues().apply {
-            put(MediaStore.Audio.Media.DISPLAY_NAME, storeFilename)
+            put(Media.DISPLAY_NAME, storeFilename)
-            put(MediaStore.Audio.Media.TITLE, storeFilename)
+            put(Media.TITLE, storeFilename)
-            put(MediaStore.Audio.Media.MIME_TYPE, storeFilename.getMimeType())
+            put(Media.MIME_TYPE, storeFilename.getMimeType())
         }
 
         val newUri = contentResolver.insert(audioCollection, newSongDetails)