Merge pull request #154 from hotwired/ci-lint

Address CI lint errors
hotwired · Feb 24, 2021 · 24b0559 · 24b0559
2 parents 9930d03 + a4814ff
commit 24b0559
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,6 +9,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Run lint
+        run: ./gradlew turbo:lint
+
       - name: Run tests
         run: ./gradlew testRelease
 

diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/util/TurboUriHelper.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/util/TurboUriHelper.kt
@@ -71,8 +71,10 @@ class TurboUriHelper(val context: Context) {
     }
 
     private fun uriAttributesFromContentQuery(uri: Uri, mimeType: String?, cursor: Cursor): TurboUriAttributes? {
-        val fileName: String? = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
-        val fileSize: Long = cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE))
+        val columnName = cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
+        val columnSize = cursor.getColumnIndexOrThrow(OpenableColumns.SIZE)
+        val fileName: String? = cursor.getString(columnName)
+        val fileSize: Long = cursor.getLong(columnSize)
 
         if (fileName == null && mimeType == null) {
             return null