Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ANR by upgrading Firebase Messaging.

Browse Source
This commit is contained in:
Cody Henthorne
2021-06-16 19:53:17 -04:00
parent fa26fb6b8b
commit 3c6bed90db
4 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java
View File

@@ -4,13 +4,13 @@ import android.text.TextUtils;
import androidx.annotation.WorkerThread;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.messaging.FirebaseMessaging;
import org.signal.core.util.logging.Log;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.ExecutionException;
public final class FcmUtil {
@@ -21,25 +21,15 @@ public final class FcmUtil {
*/
@WorkerThread
public static Optional<String> getToken() {
CountDownLatch latch = new CountDownLatch(1);
AtomicReference<String> token = new AtomicReference<>(null);
FirebaseInstanceId.getInstance().getInstanceId().addOnCompleteListener(task -> {
if (task.isSuccessful() && task.getResult() != null && !TextUtils.isEmpty(task.getResult().getToken())) {
token.set(task.getResult().getToken());
} else {
Log.w(TAG, "Failed to get the token.", task.getException());
}
latch.countDown();
});
String token = null;
try {
latch.await();
token = Tasks.await(FirebaseMessaging.getInstance().getToken());
} catch (InterruptedException e) {
Log.w(TAG, "Was interrupted while waiting for the token.");
} catch (ExecutionException e) {
Log.w(TAG, "Failed to get the token.", e.getCause());
}
return Optional.fromNullable(token.get());
return Optional.fromNullable(TextUtils.isEmpty(token) ? null : token);
}
}