TouchInstinct
/
RoboSwag-components
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assertions logs added on binding

This commit is contained in:
Gavriil Sitnikov 2016-09-12 17:00:25 +03:00
parent a5b54816c3
commit 621cd82f7f
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
View File

@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
import ru.touchin.roboswag.components.utils.LifecycleBindable;
import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
import rx.Observable;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
@ -95,9 +96,10 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
@NonNull
@Override
public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
final String codePoint = Lc.getCodePoint(this, 1);
final Observable<T> safeObservable = observable
.onErrorResumeNext(throwable -> {
Lc.assertion(throwable);
Lc.assertion(new ShouldNotHappenException("Unexpected error on bind at " + codePoint, throwable));
return Observable.never();
})
.observeOn(AndroidSchedulers.mainThread());

2
src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
View File

@ -390,7 +390,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
historyPreLoadingSubscription = null;
}
if (position - getHeadersCount() > innerCollection.size() - PRE_LOADING_COUNT) {
historyPreLoadingSubscription = bind(historyPreLoadingObservable, Actions.empty());
historyPreLoadingSubscription = bind(historyPreLoadingObservable.onErrorReturn(ignored -> null), Actions.empty());
}
}

24
src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
View File

@ -22,6 +22,7 @@ package ru.touchin.roboswag.components.utils;
import android.support.annotation.NonNull;
import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
import rx.Observable;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
@ -72,9 +73,10 @@ public class BaseLifecycleBindable implements LifecycleBindable {
@NonNull
@Override
public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
final String codePoint = Lc.getCodePoint(this, 2);
final Observable<T> safeObservable = observable
.onErrorResumeNext(throwable -> {
Lc.assertion(throwable);
Lc.assertion(new ShouldNotHappenException("Unexpected error on bind at " + codePoint, throwable));
return Observable.never();
})
.observeOn(AndroidSchedulers.mainThread());
@ -86,13 +88,19 @@ public class BaseLifecycleBindable implements LifecycleBindable {
@NonNull
@Override
public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
return untilStop(observable, Actions.empty(), Lc::assertion, Actions.empty());
final String codePoint = Lc.getCodePoint(this, 2);
return untilStop(observable, Actions.empty(),
throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on untilStop at " + codePoint, throwable)),
Actions.empty());
}
@NonNull
@Override
public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
return untilStop(observable, onNextAction, Lc::assertion, Actions.empty());
final String codePoint = Lc.getCodePoint(this, 2);
return untilStop(observable, onNextAction,
throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on untilStop at " + codePoint, throwable)),
Actions.empty());
}
@NonNull
@ -115,14 +123,20 @@ public class BaseLifecycleBindable implements LifecycleBindable {
@NonNull
@Override
public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
return untilDestroy(observable, Actions.empty(), Lc::assertion, Actions.empty());
final String codePoint = Lc.getCodePoint(this, 2);
return untilDestroy(observable, Actions.empty(),
throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on untilDestroy at " + codePoint, throwable)),
Actions.empty());
}
@NonNull
@Override
public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
@NonNull final Action1<T> onNextAction) {
return untilDestroy(observable, onNextAction, Lc::assertion, Actions.empty());
final String codePoint = Lc.getCodePoint(this, 2);
return untilDestroy(observable, onNextAction,
throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on untilDestroy at " + codePoint, throwable)),
Actions.empty());
}
@NonNull