Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit 4de4195

Browse files
committed
Add missing onError's
1 parent f81ea72 commit 4de4195

6 files changed

Lines changed: 50 additions & 25 deletions

File tree

app/src/main/java/net/squanchy/eventdetails/EventDetailsActivity.kt

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import net.squanchy.notification.NotificationsIntentService
1616
import net.squanchy.schedule.domain.view.Event
1717
import net.squanchy.signin.SignInOrigin
1818
import net.squanchy.speaker.domain.view.Speaker
19+
import timber.log.Timber
1920

2021
class EventDetailsActivity : AppCompatActivity() {
2122

@@ -65,7 +66,10 @@ class EventDetailsActivity : AppCompatActivity() {
6566
subscriptions.add(
6667
service.event(eventId)
6768
.observeOn(AndroidSchedulers.mainThread())
68-
.subscribe { event -> eventDetailsRoot.updateWith(event, onEventDetailsClickListener(event)) }
69+
.subscribe(
70+
{ event -> eventDetailsRoot.updateWith(event, onEventDetailsClickListener(event)) },
71+
Timber::e
72+
)
6973
)
7074
}
7175

@@ -78,17 +82,22 @@ class EventDetailsActivity : AppCompatActivity() {
7882
override fun onFavoriteClick() {
7983
subscriptions.add(
8084
service.toggleFavorite(event)
81-
.subscribe { result ->
82-
if (result === EventDetailsService.FavoriteResult.MUST_AUTHENTICATE) {
83-
requestSignIn()
84-
} else {
85-
triggerNotificationService()
86-
}
87-
}
85+
.subscribe(
86+
onFavouriteStateChange(),
87+
Timber::e
88+
)
8889
)
8990
}
9091
}
9192

93+
private fun onFavouriteStateChange() = { result: EventDetailsService.FavoriteResult ->
94+
if (result === EventDetailsService.FavoriteResult.MUST_AUTHENTICATE) {
95+
requestSignIn()
96+
} else {
97+
triggerNotificationService()
98+
}
99+
}
100+
92101
private fun requestSignIn() {
93102
navigator.toSignInForResult(REQUEST_CODE_SIGNIN, SignInOrigin.EVENT_DETAILS)
94103
unsubscribeFromUpdates()

app/src/main/java/net/squanchy/favorites/FavoritesPageView.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import io.reactivex.Observable
99
import io.reactivex.android.schedulers.AndroidSchedulers
1010
import io.reactivex.disposables.CompositeDisposable
1111
import io.reactivex.functions.BiFunction
12+
import io.reactivex.schedulers.Schedulers
1213
import kotlinx.android.synthetic.main.view_page_favorites.view.*
1314
import net.squanchy.R
1415
import net.squanchy.analytics.Analytics
@@ -19,6 +20,7 @@ import net.squanchy.home.Loadable
1920
import net.squanchy.navigation.Navigator
2021
import net.squanchy.schedule.domain.view.Event
2122
import net.squanchy.support.unwrapToActivityContext
23+
import timber.log.Timber
2224

2325
class FavoritesPageView @JvmOverloads constructor(
2426
context: Context?,
@@ -63,8 +65,9 @@ class FavoritesPageView @JvmOverloads constructor(
6365
favoritesService.currentUserIsSignedIn(),
6466
BiFunction<List<FavoritesItem>, Boolean, LoadResult>(::LoadResult)
6567
)
68+
.subscribeOn(Schedulers.io())
6669
.observeOn(AndroidSchedulers.mainThread())
67-
.subscribe(::handleLoadSchedule)
70+
.subscribe(::handleLoadSchedule, Timber::e)
6871
)
6972
}
7073

app/src/main/java/net/squanchy/schedule/tracksfilter/ScheduleTracksFilter.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import net.squanchy.schedule.domain.view.Track
2424
import net.squanchy.service.repository.TracksRepository
2525
import net.squanchy.support.view.setAdapterIfNone
2626
import net.squanchy.support.widget.OriginCoordinates
27+
import timber.log.Timber
2728
import kotlin.math.hypot
2829

2930
class ScheduleTracksFilterActivity : AppCompatActivity() {
@@ -118,11 +119,14 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
118119
.distinctUntilChanged()
119120
.subscribeOn(Schedulers.computation())
120121
.observeOn(AndroidSchedulers.mainThread())
121-
.subscribe { checkableTracks ->
122-
trackFiltersList.setAdapterIfNone(trackAdapter)
123-
this.checkableTracks = checkableTracks
124-
trackAdapter.submitList(checkableTracks)
125-
}
122+
.subscribe(
123+
{ checkableTracks ->
124+
trackFiltersList.setAdapterIfNone(trackAdapter)
125+
this.checkableTracks = checkableTracks
126+
trackAdapter.submitList(checkableTracks)
127+
},
128+
Timber::e
129+
)
126130
}
127131

128132
private fun prepareAppearAnimation() {

app/src/main/java/net/squanchy/settings/SettingsFragment.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import net.squanchy.signin.SignInService
2424
import net.squanchy.support.lang.getOrThrow
2525
import net.squanchy.wificonfig.WifiConfigOrigin
2626
import net.squanchy.wificonfig.WifiConfigService
27+
import timber.log.Timber
2728

2829
class SettingsFragment : PreferenceFragment() {
2930

@@ -131,7 +132,7 @@ class SettingsFragment : PreferenceFragment() {
131132
subscriptions.add(
132133
signInService.currentUser()
133134
.observeOn(AndroidSchedulers.mainThread())
134-
.subscribe(::onUserChanged)
135+
.subscribe(::onUserChanged, Timber::e)
135136
)
136137
}
137138

@@ -157,10 +158,13 @@ class SettingsFragment : PreferenceFragment() {
157158
accountSignInSignOutPreference.setOnPreferenceClickListener {
158159
subscriptions.add(
159160
signInService.signOut()
160-
.subscribe {
161-
Snackbar.make(viewOrThrow, R.string.settings_message_signed_out, Snackbar.LENGTH_SHORT).show()
162-
analytics.trackUserNotLoggedIn()
163-
}
161+
.subscribe(
162+
{
163+
Snackbar.make(viewOrThrow, R.string.settings_message_signed_out, Snackbar.LENGTH_SHORT).show()
164+
analytics.trackUserNotLoggedIn()
165+
},
166+
Timber::e
167+
)
164168
)
165169
return@setOnPreferenceClickListener true
166170
}

app/src/main/java/net/squanchy/signin/SignInActivity.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import net.squanchy.R
1919
import net.squanchy.analytics.Analytics
2020
import net.squanchy.google.GoogleClientId
2121
import net.squanchy.support.config.DialogLayoutParameters
22+
import timber.log.Timber
2223

2324
class SignInActivity : AppCompatActivity() {
2425

@@ -111,11 +112,14 @@ class SignInActivity : AppCompatActivity() {
111112

112113
subscription = service.signInWithGoogle(account)
113114
.subscribeOn(AndroidSchedulers.mainThread())
114-
.subscribe {
115-
analytics.trackUserLoggedInFrom(getSignInOrigin())
116-
setResult(RESULT_OK)
117-
finish()
118-
}
115+
.subscribe(
116+
{
117+
analytics.trackUserLoggedInFrom(getSignInOrigin())
118+
setResult(RESULT_OK)
119+
finish()
120+
},
121+
Timber::e
122+
)
119123
}
120124

121125
private fun getSignInOrigin() = intent.getSerializableExtra(EXTRA_SIGN_IN_ORIGIN) as SignInOrigin

app/src/main/java/net/squanchy/venue/VenueInfoPageView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import net.squanchy.navigation.Navigator
1616
import net.squanchy.support.text.parseHtml
1717
import net.squanchy.support.unwrapToActivityContext
1818
import net.squanchy.venue.domain.view.Venue
19+
import timber.log.Timber
1920

2021
class VenueInfoPageView @JvmOverloads constructor(
2122
context: Context,
@@ -66,7 +67,7 @@ class VenueInfoPageView @JvmOverloads constructor(
6667
override fun startLoading() {
6768
subscription = service.venue()
6869
.observeOn(AndroidSchedulers.mainThread())
69-
.subscribe(::updateWith)
70+
.subscribe(::updateWith, Timber::e)
7071
}
7172

7273
private fun updateWith(venue: Venue) {

0 commit comments

Comments
 (0)