1.2.3

- Fixed query arguments not showing correctly on error
- updated gradle plugin to 3.6.2
- updated kotlin to 1.3.71

Author: ologe

app/src/main/java/dev/olog/contentresolversql/example/MainActivity.kt

@@ -1,10 +1,10 @@
 package dev.olog.contentresolversql.example
 
+import android.Manifest
 import android.os.Bundle
 import android.provider.MediaStore
-import android.provider.MediaStore.Audio.AlbumColumns.ARTIST
-import android.provider.MediaStore.Audio.AudioColumns.*
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import dev.olog.contentresolversql.querySql
 
 class MainActivity : AppCompatActivity() {
@@ -13,49 +13,24 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        ActivityCompat.requestPermissions(
+            this,
+            arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE),
+            0
+        )
+
         example()
     }
 
 
-    private fun example(){
-        var query = """
+    private fun example() {
+        val query = """
             SELECT *
             FROM ${MediaStore.Audio.Media.EXTERNAL_CONTENT_URI}
+            WHERE id = ?
         """.trimIndent()
 
-        contentResolver.querySql(query).close()
-
-        query = """
-            SELECT distinct $ARTIST_ID, $ARTIST, count(*) as songs, count(distinct $ALBUM_ID) as albums
-            FROM ${MediaStore.Audio.Media.EXTERNAL_CONTENT_URI}
-            WHERE $IS_PODCAST = 0
-            GROUP BY $ARTIST_ID
-            HAVING songs >= 2 AND albums >= 2
-            ORDER BY $ARTIST_KEY ASC
-            LIMIT 20
-            OFFSET 2
-        """.trimIndent()
-
-        val cursor = contentResolver.querySql(query)
-        val result = mutableListOf<Artist>()
-        while (cursor.moveToNext()){
-            val item = Artist(
-                cursor.getLong(cursor.getColumnIndex(ARTIST_ID)),
-                cursor.getString(cursor.getColumnIndex(ARTIST)),
-                cursor.getInt(cursor.getColumnIndex("songs")),
-                cursor.getInt(cursor.getColumnIndex("albums"))
-            )
-            result.add(item)
-        }
-
-        cursor.close()
+        contentResolver.querySql(query, arrayOf("1")).close()
     }
 
-}
-
-data class Artist(
-    val id: Long,
-    val name: String,
-    val songs: Int,
-    val albums: Int
-)
+}

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon May 13 20:08:29 CEST 2019
+#Sat Apr 11 15:59:34 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

library/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         // sdk_version, major, minor, patch(1st)beta(2nd)
-        versionCode 29_1_2_2
-        versionName "1.2.2"
+        versionCode 29_1_2_03
+        versionName "1.2.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -27,7 +27,7 @@ android {
 dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

library/src/main/java/dev/olog/contentresolversql/ContentResolverExtension.kt

@@ -89,7 +89,7 @@ fun ContentResolver.querySql(
             sortOrder
         )!!
     } catch (ex: Throwable) {
-        Log.e("ContentResolverSQL", "Executed query:\n$query \nargs=$selectionArgs")
+        Log.e("ContentResolverSQL", "Executed query:\n$query \nargs=${selectionArgs?.toList()}")
         throw ex
     }
 }