r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix build problem, make class static and fix some generics problems

Browse Source
This commit is contained in:
Anthony Restaino 2016-02-03 19:58:05 -05:00
parent ac3f43a76f
commit c05cc7c9be
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/acr/browser/lightning/react/Observable.java
View File

@ -21,12 +21,12 @@ public class Observable<T> {
private static final String TAG = Observable.class.getSimpleName();
@NonNull private Action<T> mAction;
@NonNull private final Action<T> mAction;
@Nullable private Executor mSubscriber;
@Nullable private Executor mObserver;
@NonNull private final Executor mDefault;
public Observable(@NonNull Action<T> action) {
private Observable(@NonNull Action<T> action) {
mAction = action;
Looper looper = Looper.myLooper();
Preconditions.checkNonNull(looper);
@ -111,7 +111,7 @@ public class Observable<T> {
public void onComplete() {
if (!mOnCompleteExecuted) {
mOnCompleteExecuted = true;
executeOnObserverThread(new OnCompleteRunnable(subscription));
executeOnObserverThread(new OnCompleteRunnable<>(subscription));
} else {
Log.e(TAG, "onComplete called more than once");
throw new RuntimeException("onComplete called more than once");
@ -121,7 +121,7 @@ public class Observable<T> {
@Override
public void onNext(final T item) {
if (!mOnCompleteExecuted) {
executeOnObserverThread(new OnNextRunnable(subscription, item));
executeOnObserverThread(new OnNextRunnable<>(subscription, item));
} else {
Log.e(TAG, "onComplete has been already called, onNext should not be called");
throw new RuntimeException("onNext should not be called after onComplete has been called");
@ -149,10 +149,10 @@ public class Observable<T> {
}
}
private static class OnCompleteRunnable implements Runnable {
private final Subscription subscription;
private static class OnCompleteRunnable<T> implements Runnable {
private final Subscription<T> subscription;
public OnCompleteRunnable(Subscription subscription) {this.subscription = subscription;}
public OnCompleteRunnable(Subscription<T> subscription) {this.subscription = subscription;}
@Override
public void run() {
@ -160,7 +160,7 @@ public class Observable<T> {
}
}
private class OnNextRunnable implements Runnable {
private static class OnNextRunnable<T> implements Runnable {
private final Subscription<T> subscription;
private final T item;

4
build.gradle
View File

@ -12,8 +12,6 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
mavenCentral()
}
}