@@ -8,6 +8,7 @@ import android.content.UriMatcher
88import android.database.Cursor
99import android.net.Uri
1010import android.util.Log
11+ import androidx.core.net.toUri
1112
1213class WordContentProvider : ContentProvider () {
1314
@@ -16,7 +17,7 @@ class WordContentProvider : ContentProvider() {
1617 override fun onCreate (): Boolean {
1718 Log .i(TAG , " onCreate" )
1819
19- Log .i(TAG , " URI_WORD: " + URI_WORD )
20+ Log .i(TAG , " URI_WORD: $ URI_WORD" )
2021
2122 return true
2223 }
@@ -29,7 +30,7 @@ class WordContentProvider : ContentProvider() {
2930 projection : Array <String >? ,
3031 selection : String? ,
3132 selectionArgs : Array <String >? ,
32- sortOrder : String?
33+ sortOrder : String? ,
3334 ): Cursor ? {
3435 Log .i(TAG , " query" )
3536
@@ -123,7 +124,7 @@ class WordContentProvider : ContentProvider() {
123124 uri : Uri ,
124125 values : ContentValues ? ,
125126 selection : String? ,
126- selectionArgs : Array <String >?
127+ selectionArgs : Array <String >? ,
127128 ): Int {
128129 Log .i(TAG , " update" )
129130
@@ -147,17 +148,17 @@ class WordContentProvider : ContentProvider() {
147148 private const val CODE_WORDS = 1
148149 private const val CODE_WORD_ID = 2
149150 private const val CODE_WORDS_BY_STORYBOOK_PARAGRAPH_ID = 3
150- val URI_WORD : Uri = Uri .parse (" content://" + AUTHORITY + " / " + TABLE_WORDS )
151+ val URI_WORD : Uri = (" content://$ AUTHORITY/ $ TABLE_WORDS" ).toUri( )
151152
152153 // The URI matcher
153154 private val MATCHER = UriMatcher (UriMatcher .NO_MATCH )
154155
155156 init {
156157 MATCHER .addURI(AUTHORITY , TABLE_WORDS , CODE_WORDS )
157- MATCHER .addURI(AUTHORITY , TABLE_WORDS + " /#" , CODE_WORD_ID )
158+ MATCHER .addURI(AUTHORITY , " $TABLE_WORDS /#" , CODE_WORD_ID )
158159 MATCHER .addURI(
159160 AUTHORITY ,
160- TABLE_WORDS + " /by-paragraph-id/#" ,
161+ " $TABLE_WORDS /by-paragraph-id/#" ,
161162 CODE_WORDS_BY_STORYBOOK_PARAGRAPH_ID
162163 )
163164 }
0 commit comments