Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-05-23 17:38:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Guard against NullPointerExceptions when getting details from a GoogleJsonResponseException

Browse Source
This commit is contained in:
Jon Chambers
2026-05-21 10:24:52 -04:00
committed by Jon Chambers
parent 22656396dc
commit da439e7144
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/GooglePlayBillingManager.java
+8 -4
View File
@@ -14,7 +14,6 @@ import com.google.api.services.androidpublisher.AndroidPublisherRequest;
import com.google.api.services.androidpublisher.AndroidPublisherScopes;
import com.google.api.services.androidpublisher.model.AutoRenewingPlan;
import com.google.api.services.androidpublisher.model.Money;
import com.google.api.services.androidpublisher.model.OfferDetails;
import com.google.api.services.androidpublisher.model.SubscriptionPurchaseLineItem;
import com.google.api.services.androidpublisher.model.SubscriptionPurchaseV2;
import com.google.api.services.androidpublisher.model.SubscriptionPurchasesAcknowledgeRequest;
@@ -335,9 +334,14 @@ public class GooglePlayBillingManager implements SubscriptionPaymentProcessor {
if (e.getStatusCode() == Response.Status.TOO_MANY_REQUESTS.getStatusCode()) {
throw new RateLimitExceededException(null);
}
final String details = e instanceof GoogleJsonResponseException
? ((GoogleJsonResponseException) e).getDetails().toString()
: "";
final String details;
if (e instanceof GoogleJsonResponseException googleJsonResponseException && googleJsonResponseException.getDetails() != null) {
details = googleJsonResponseException.getDetails().toString();
} else {
details = "";
}
final String message =
String.format("Unexpected HTTP status code %s from androidpublisher: %s", e.getStatusCode(), details);