diff options
| author | Allan Wang <me@allanwang.ca> | 2018-09-26 14:56:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 14:56:44 -0400 |
| commit | 438affb07ae106e490884fafa3c2dd825e7649a4 (patch) | |
| tree | b94e182bf4d083af049120a6b5f94f82c4595318 /app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt | |
| parent | c5e769deabeb80d7257b85c5c3d802cf46e6b191 (diff) | |
| download | frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.gz frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.bz2 frost-438affb07ae106e490884fafa3c2dd825e7649a4.zip | |
Cleanup (#1087)
* Feature/download manager (#855)
* Add initial github release check
* Create update service
* Clean old manager directory
* Update kau
* Update updateActivity snippet
* Add back gradle keys
* Remove update service functionality
* Update changelog
* Misc (#865)
* Clean up git code
* Update download link
* Update theme
* Reorder settings, resolvees #856
* Do not log undeliverable exception
* Handle potential lack of webview
* Set notification epoch default to now, resolves #857
* Fix notification epoch time init
* Update changelog
* Update theme
* Add slack url, resolves #880
* Prepare for image update
* Fix view full image (#882)
* Test including full photo viewer
* Test cookie in glide
* Fix parser and add redirects to view full image
* Update changelog
* Fix compilation and add new keys
* Update all versions
* Fix signing configs
* Fix exoplayer api update
* Change string usage
* Test scss on travis
* Test with node_js flag
* Add back css
* Update versions and fix video view
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt index 4622971b..19b1176e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt @@ -17,7 +17,9 @@ import com.pitchedapps.frost.facebook.WEB_LOAD_DELAY import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable +import io.reactivex.rxkotlin.addTo import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject @@ -53,6 +55,8 @@ abstract class FrostContentView<out T> @JvmOverloads constructor( override val refreshObservable: PublishSubject<Boolean> = PublishSubject.create() override val titleObservable: BehaviorSubject<String> = BehaviorSubject.create() + private val compositeDisposable = CompositeDisposable() + override lateinit var baseUrl: String override var baseEnum: FbItem? = null @@ -81,14 +85,14 @@ abstract class FrostContentView<out T> @JvmOverloads constructor( progress.setProgress(it, true) else progress.progress = it - } + }.addTo(compositeDisposable) refreshObservable .observeOn(AndroidSchedulers.mainThread()) .subscribe { refresh.isRefreshing = it refresh.isEnabled = true - } + }.addTo(compositeDisposable) refresh.setOnRefreshListener { coreView.reload(true) } reloadThemeSelf() @@ -126,6 +130,7 @@ abstract class FrostContentView<out T> @JvmOverloads constructor( progressObservable.onComplete() refreshObservable.onComplete() core.destroy() + compositeDisposable.dispose() } private var dispose: Disposable? = null |