Skip to content

Release v1.0.2 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 17, 2019
Merged

Release v1.0.2 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f2399e
Fix for crashlytics issue 3ae697631e58ecba549ba531775e0a6a
MostafaGazar Jul 17, 2019
0ee0217
Attempt fix for crashlytics issue d6c598277f6283ff3ac9251efb66b796
MostafaGazar Jul 17, 2019
22bf170
Bump version
MostafaGazar Jul 17, 2019
dc7469a
Merge pull request #23 from MostafaGazar/develop
MostafaGazar Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -55,8 +55,8 @@ android {
}

compileOptions {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

Expand Down
35 changes: 17 additions & 18 deletions app/src/main/java/com/koalatea/sedaily/downloader/DownloadManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}

Expand Down