@@ -260,8 +260,7 @@ public void run() {
260
260
try {
261
261
if (senderId != null ) {
262
262
FirebaseInstanceId .getInstance ().deleteToken (senderId , FCM_VALUE );
263
- }
264
- else {
263
+ } else {
265
264
FirebaseInstanceId .getInstance ().deleteInstanceId ();
266
265
}
267
266
@@ -303,33 +302,32 @@ public void run() {
303
302
private Task <String > getToken (final String senderId ) {
304
303
if (senderId == null ) {
305
304
return FirebaseInstanceId .getInstance ()
306
- .getInstanceId ()
307
- . continueWithTask ( new Continuation < InstanceIdResult , Task < String >>() {
308
- @ Override
309
- public Task < String > then ( @ NonNull Task < InstanceIdResult > task ) throws Exception {
310
- if (! task . isSuccessful ()) {
311
- return Tasks . forException ( task .getException ());
312
- }
313
- InstanceIdResult result = task . getResult ();
314
- return Tasks . forResult ( task .getResult (). getToken () );
315
- }
316
- });
317
- }
318
- else {
305
+ .getInstanceId ()
306
+ . continueWithTask (
307
+ new Continuation < InstanceIdResult , Task < String >>() {
308
+ @ Override
309
+ public Task < String > then ( @ NonNull Task < InstanceIdResult > task ) throws Exception {
310
+ if (! task .isSuccessful ()) {
311
+ return Tasks . forException ( task . getException ());
312
+ }
313
+ InstanceIdResult result = task .getResult ();
314
+ return Tasks . forResult ( task . getResult (). getToken ());
315
+ }
316
+ });
317
+ } else {
319
318
final TaskCompletionSource <String > task = new TaskCompletionSource <String >();
320
319
new Thread (
321
- new Runnable () {
322
- @ Override
323
- public void run () {
324
- try {
325
- task .setResult (FirebaseInstanceId .getInstance ().getToken (senderId , FCM_VALUE ));
326
- }
327
- catch (IOException e ) {
328
- task .setException (e );
329
- }
330
- }
331
- })
332
- .start ();
320
+ new Runnable () {
321
+ @ Override
322
+ public void run () {
323
+ try {
324
+ task .setResult (FirebaseInstanceId .getInstance ().getToken (senderId , FCM_VALUE ));
325
+ } catch (IOException e ) {
326
+ task .setException (e );
327
+ }
328
+ }
329
+ })
330
+ .start ();
333
331
return task .getTask ();
334
332
}
335
333
}
0 commit comments