mirror-github-minimalbible
/
MinimalBible
mirror of https://github.com/MinimalBible/MinimalBible
1
0
Fork 0
Code Issues Releases Wiki Activity

More slight edits

build-21
Bradlee Speice 2014-11-22 00:57:52 -05:00
parent fc38192dba
commit 81ebeb43b3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/BookManager.kt
View File

@ -63,8 +63,8 @@ class BookManager(private val installedBooks: Books, val rM: RefreshManager) :
fun downloadBook(b: Book) { fun downloadBook(b: Book) {
// First, look up where the Book came from // First, look up where the Book came from
Observable.just(rM installerFromBook b) Observable.just(rM installerFromBook b)
.subscribeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe { it.toBlocking().first() install b } .subscribe { it subscribe { it install b } }
downloadEvents onNext DLProgressEvent(DLProgressEvent.PROGRESS_BEGINNING, b) downloadEvents onNext DLProgressEvent(DLProgressEvent.PROGRESS_BEGINNING, b)
} }

1
app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/LocaleManager.kt
View File

@ -36,6 +36,7 @@ class LocaleManager(val rM: RefreshManager) {
} }
// TODO: Fix the actual Language implementation - Pull Request? // TODO: Fix the actual Language implementation - Pull Request?
// Can't use a data class because we need to get the name of the language
private class FixedLanguage(language: Language?) : private class FixedLanguage(language: Language?) :
Language(language?.getCode() ?: Language.UNKNOWN_LANG_CODE) { Language(language?.getCode() ?: Language.UNKNOWN_LANG_CODE) {
override fun hashCode() = this.getName().hashCode() override fun hashCode() = this.getName().hashCode()