From 6c1ba957bd2a39dd81b802b0a5efef69d496d090 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Tue, 7 Jul 2020 09:34:02 -0500
Subject: [PATCH] Ensure the default alphaId configuration is an empty list
 rather than null

---
 .../textsecuregcm/configuration/TwilioConfiguration.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java
index 1964cb339..8d2352830 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java
@@ -22,6 +22,7 @@ import com.google.common.annotations.VisibleForTesting;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 public class TwilioConfiguration {
@@ -55,7 +56,7 @@ public class TwilioConfiguration {
 
   @NotNull
   @Valid
-  private List<TwilioAlphaIdConfiguration> alphaId;
+  private List<TwilioAlphaIdConfiguration> alphaId = new ArrayList<>();
 
   public String getAccountId() {
     return accountId;