Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-25 15:28:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for broken string format

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-12-01 11:44:48 -08:00
parent b31a88043e
commit 0bc494245d
11 changed files with 22 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@@ -19,7 +19,6 @@ package org.whispersystems.textsecuregcm;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.whispersystems.textsecuregcm.configuration.FederationConfiguration;
import org.whispersystems.textsecuregcm.configuration.GraphiteConfiguration;
import org.whispersystems.textsecuregcm.configuration.NexmoConfiguration;
import org.whispersystems.textsecuregcm.configuration.PushConfiguration;
import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedPhoneConfiguration;
@@ -31,7 +30,6 @@ import org.whispersystems.textsecuregcm.configuration.WebsocketConfiguration;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -48,9 +46,6 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty
private TwilioConfiguration twilio;
@JsonProperty
private NexmoConfiguration nexmo;
@NotNull
@Valid
@JsonProperty
@@ -120,10 +115,6 @@ public class WhisperServerConfiguration extends Configuration {
return twilio;
}
public NexmoConfiguration getNexmoConfiguration() {
return nexmo;
}
public PushConfiguration getPushConfiguration() {
return push;
}