From 1f2399e440fb10fa44909cffa8a9b552c429fa68 Mon Sep 17 00:00:00 2001 From: Mostafa Gazar Date: Wed, 17 Jul 2019 15:34:46 +1200 Subject: [PATCH 1/3] Fix for crashlytics issue 3ae697631e58ecba549ba531775e0a6a --- .../sedaily/downloader/DownloadManager.kt | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/koalatea/sedaily/downloader/DownloadManager.kt b/app/src/main/java/com/koalatea/sedaily/downloader/DownloadManager.kt index 757f44b..166caba 100644 --- a/app/src/main/java/com/koalatea/sedaily/downloader/DownloadManager.kt +++ b/app/src/main/java/com/koalatea/sedaily/downloader/DownloadManager.kt @@ -36,26 +36,25 @@ class DownloadManager( downloadManager?.let { val query = DownloadManager.Query().setFilterById(downloadId) - val cursor = downloadManager.query(query).apply { - moveToFirst() - } - - val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)) - val uri = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)) - val reason = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_REASON)) - val bytesDownloaded = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)) - val bytesTotal = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)) - val progress = bytesDownloaded * 100f / bytesTotal + val cursor = downloadManager.query(query) + if (cursor.moveToFirst()) { + val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)) + val uri = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)) + val reason = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_REASON)) + val bytesDownloaded = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)) + val bytesTotal = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)) + val progress = bytesDownloaded * 100f / bytesTotal - cursor.close() + cursor.close() - return when(status) { - DownloadManager.STATUS_SUCCESSFUL -> DownloadStatus.Downloaded(uri) - DownloadManager.STATUS_FAILED -> DownloadStatus.Error(reason) - DownloadManager.STATUS_RUNNING -> DownloadStatus.Downloading(progress) - DownloadManager.STATUS_PAUSED -> DownloadStatus.Downloading(progress) - DownloadManager.STATUS_PENDING -> DownloadStatus.Downloading(progress) - else -> DownloadStatus.Unknown + return when (status) { + DownloadManager.STATUS_SUCCESSFUL -> DownloadStatus.Downloaded(uri) + DownloadManager.STATUS_FAILED -> DownloadStatus.Error(reason) + DownloadManager.STATUS_RUNNING -> DownloadStatus.Downloading(progress) + DownloadManager.STATUS_PAUSED -> DownloadStatus.Downloading(progress) + DownloadManager.STATUS_PENDING -> DownloadStatus.Downloading(progress) + else -> DownloadStatus.Unknown + } } } From 0ee021732b7fef48bc2c185dc5ac1078f8169e41 Mon Sep 17 00:00:00 2001 From: Mostafa Gazar Date: Wed, 17 Jul 2019 15:43:15 +1200 Subject: [PATCH 2/3] Attempt fix for crashlytics issue d6c598277f6283ff3ac9251efb66b796 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b003293..f1387c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,8 +55,8 @@ android { } compileOptions { - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } From 22bf1702f0fccef0ebb9f7473eda5c0ac80d2d3e Mon Sep 17 00:00:00 2001 From: Mostafa Gazar Date: Wed, 17 Jul 2019 15:44:47 +1200 Subject: [PATCH 3/3] Bump version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f1387c9..5eb5783 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "com.koalatea.sedaily" minSdkVersion 21 targetSdkVersion 29 - versionCode 17 - versionName "1.0.1" + versionCode 18 + versionName "1.0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }