Skip to content

Commit 66d8e6f

Browse files
lgguzmanlgguzman
authored
Merge pull request #24 from sbxcloud/annotationlib
rx error handler
2 parents 18b863f + 81477e1 commit 66d8e6f

8 files changed

Lines changed: 107 additions & 1 deletion

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Agregamos la librería como dependencia
2424

2525
dependencies {
2626
//...otras dependencias de tu proyeco aquí.....
27-
compile 'com.github.sbxcloud:androidlib:v2.3.0'
27+
compile 'com.github.sbxcloud:androidlib:v2.3.1'
2828
}
2929
3030
Esta librería se basa en annotaciones. Para crear tu propia Clase usuario puedes hacerla así:

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/auth/SbxUser.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
import io.reactivex.Single;
3535
import io.reactivex.SingleEmitter;
3636
import io.reactivex.SingleOnSubscribe;
37+
import io.reactivex.SingleSource;
3738
import io.reactivex.android.schedulers.AndroidSchedulers;
39+
import io.reactivex.functions.Function;
3840
import io.reactivex.schedulers.Schedulers;
3941
import okhttp3.Call;
4042
import okhttp3.Callback;
@@ -108,6 +110,11 @@ public void run() {
108110
}
109111
}).start();
110112
}
113+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
114+
@Override
115+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
116+
return Single.error(throwable);
117+
}
111118
});
112119
}
113120

@@ -139,6 +146,11 @@ public void run() {
139146
}).start();
140147

141148
}
149+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
150+
@Override
151+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
152+
return Single.error(throwable);
153+
}
142154
});
143155
}
144156

@@ -305,6 +317,11 @@ public void run() {
305317
}).start();
306318

307319
}
320+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends String>>() {
321+
@Override
322+
public SingleSource<? extends String> apply(Throwable throwable) throws Exception {
323+
return Single.error(throwable);
324+
}
308325
});
309326
}
310327

@@ -360,6 +377,11 @@ public void run() {
360377
}).start();
361378

362379
}
380+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends String>>() {
381+
@Override
382+
public SingleSource<? extends String> apply(Throwable throwable) throws Exception {
383+
return Single.error(throwable);
384+
}
363385
});
364386
}
365387

@@ -424,6 +446,11 @@ public void run() {
424446
}).start();
425447

426448
}
449+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
450+
@Override
451+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
452+
return Single.error(throwable);
453+
}
427454
});
428455
}
429456

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/cloudscript/SbxCloudScript.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import io.reactivex.Single;
2020
import io.reactivex.SingleEmitter;
2121
import io.reactivex.SingleOnSubscribe;
22+
import io.reactivex.SingleSource;
23+
import io.reactivex.functions.Function;
2224
import okhttp3.Call;
2325
import okhttp3.Callback;
2426
import okhttp3.Request;
@@ -135,6 +137,11 @@ public void run() {
135137
}).start();
136138

137139
}
140+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends SbxCloudScript>>() {
141+
@Override
142+
public SingleSource<? extends SbxCloudScript> apply(Throwable throwable) throws Exception {
143+
return Single.error(throwable);
144+
}
138145
});
139146

140147
}

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/message/SbxChannel.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import io.reactivex.Single;
2121
import io.reactivex.SingleEmitter;
2222
import io.reactivex.SingleOnSubscribe;
23+
import io.reactivex.SingleSource;
24+
import io.reactivex.functions.Function;
2325
import okhttp3.Call;
2426
import okhttp3.Callback;
2527
import okhttp3.Request;
@@ -92,6 +94,11 @@ public void run() {
9294
}).start();
9395

9496
}
97+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends SbxChannel>>() {
98+
@Override
99+
public SingleSource<? extends SbxChannel> apply(Throwable throwable) throws Exception {
100+
return Single.error(throwable);
101+
}
95102
});
96103
}
97104

@@ -149,6 +156,11 @@ public void run() {
149156
}).start();
150157

151158
}
159+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends SbxChannel>>() {
160+
@Override
161+
public SingleSource<? extends SbxChannel> apply(Throwable throwable) throws Exception {
162+
return Single.error(throwable);
163+
}
152164
});
153165
}
154166

@@ -206,6 +218,11 @@ public void run() {
206218
}).start();
207219

208220
}
221+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends SbxMessage>>() {
222+
@Override
223+
public SingleSource<? extends SbxMessage> apply(Throwable throwable) throws Exception {
224+
return Single.error(throwable);
225+
}
209226
});
210227
}
211228

@@ -277,6 +294,11 @@ public void run() {
277294
}).start();
278295

279296
}
297+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends List<SbxMessage>>>() {
298+
@Override
299+
public SingleSource<? extends List<SbxMessage>> apply(Throwable throwable) throws Exception {
300+
return Single.error(throwable);
301+
}
280302
});
281303
}
282304

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/message/SbxPush.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import io.reactivex.Single;
1414
import io.reactivex.SingleEmitter;
1515
import io.reactivex.SingleOnSubscribe;
16+
import io.reactivex.SingleSource;
17+
import io.reactivex.functions.Function;
1618
import okhttp3.Call;
1719
import okhttp3.Callback;
1820
import okhttp3.Request;
@@ -50,6 +52,11 @@ public void run() {
5052
}).start();
5153

5254
}
55+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends String>>() {
56+
@Override
57+
public SingleSource<? extends String> apply(Throwable throwable) throws Exception {
58+
return Single.error(throwable);
59+
}
5360
});
5461
}
5562

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/model/SbxFile.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111

1212
import java.io.File;
1313
import java.io.IOException;
14+
import java.util.DuplicateFormatFlagsException;
1415

1516
import io.reactivex.Single;
1617
import io.reactivex.SingleEmitter;
1718
import io.reactivex.SingleOnSubscribe;
19+
import io.reactivex.SingleSource;
20+
import io.reactivex.functions.Function;
1821
import okhttp3.Call;
1922
import okhttp3.Callback;
2023
import okhttp3.Request;
@@ -98,6 +101,11 @@ public void run() {
98101
}).start();
99102

100103
}
104+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends String>>() {
105+
@Override
106+
public SingleSource<? extends String> apply(Throwable throwable) throws Exception {
107+
return Single.error(throwable);
108+
}
101109
});
102110
}
103111

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/model/SbxModel.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import io.reactivex.ObservableOnSubscribe;
2626
import io.reactivex.SingleEmitter;
2727
import io.reactivex.SingleOnSubscribe;
28+
import io.reactivex.SingleSource;
29+
import io.reactivex.functions.Function;
2830
import okhttp3.Call;
2931
import okhttp3.Callback;
3032
import okhttp3.Request;
@@ -88,6 +90,12 @@ public void run() {
8890
}
8991
}).start();
9092

93+
}
94+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
95+
@Override
96+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
97+
return Single.error(throwable);
98+
9199
}
92100
});
93101

@@ -121,6 +129,11 @@ public void run() {
121129
}).start();
122130

123131
}
132+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends List<T>>>() {
133+
@Override
134+
public SingleSource<? extends List<T>> apply(Throwable throwable) throws Exception {
135+
return Single.error(throwable);
136+
}
124137
});
125138

126139
}
@@ -161,6 +174,11 @@ public void run() {
161174
}).start();
162175

163176
}
177+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
178+
@Override
179+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
180+
return Single.error(throwable);
181+
}
164182
});
165183
}
166184

@@ -204,6 +222,11 @@ public void run() {
204222
}).start();
205223

206224
}
225+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
226+
@Override
227+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
228+
return Single.error(throwable);
229+
}
207230
});
208231
}
209232

@@ -315,6 +338,11 @@ public void run() {
315338
}).start();
316339

317340
}
341+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends T>>() {
342+
@Override
343+
public SingleSource<? extends T> apply(Throwable throwable) throws Exception {
344+
return Single.error(throwable);
345+
}
318346
});
319347
}
320348

‎app/src/main/java/com/sbxcloud/android/sbxcloudsdk/net/model/SbxQuery.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import io.reactivex.Single;
2727
import io.reactivex.SingleEmitter;
2828
import io.reactivex.SingleOnSubscribe;
29+
import io.reactivex.SingleSource;
30+
import io.reactivex.functions.Function;
2931
import okhttp3.Call;
3032
import okhttp3.Callback;
3133
import okhttp3.Request;
@@ -184,6 +186,11 @@ public void run() {
184186
}).start();
185187

186188
}
189+
}).onErrorResumeNext(new Function<Throwable, SingleSource<? extends List<T>>>() {
190+
@Override
191+
public SingleSource<? extends List<T>> apply(Throwable throwable) throws Exception {
192+
return Single.error(throwable);
193+
}
187194
});
188195

189196
}

0 commit comments

Comments
 (0)