Fix FCM not initialized crash.

This commit is contained in:
Cody Henthorne
2022-06-13 09:57:20 -04:00
committed by Greyson Parrelli
parent 2eb933c2d4
commit 5df20d755a
3 changed files with 9 additions and 3 deletions

View File

@@ -1,10 +1,12 @@
package org.thoughtcrime.securesms.gcm;
import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.WorkerThread;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.FirebaseApp;
import com.google.firebase.messaging.FirebaseMessaging;
import org.signal.core.util.logging.Log;
@@ -20,8 +22,12 @@ public final class FcmUtil {
* Retrieves the current FCM token. If one isn't available, it'll be generated.
*/
@WorkerThread
public static Optional<String> getToken() {
public static Optional<String> getToken(Context context) {
String token = null;
// Must be called manually if running outside of main process
FirebaseApp.initializeApp(context);
try {
token = Tasks.await(FirebaseMessaging.getInstance().getToken());
} catch (InterruptedException e) {