From 03b6b2d5910e1edc06b2cda7bfbd25cff34d3aeb Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 7 Nov 2024 11:47:31 -0400
Subject: [PATCH] Move BillingError to core-util.

---
 .../securesms/dependencies/GooglePlayBillingDependencies.kt     | 2 +-
 billing/src/main/java/org/signal/billing/BillingApiImpl.kt      | 1 +
 .../src/main/java/org/signal/core/util}/billing/BillingError.kt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {billing/src/main/java/org/signal => core-util/src/main/java/org/signal/core/util}/billing/BillingError.kt (81%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/GooglePlayBillingDependencies.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/GooglePlayBillingDependencies.kt
index 94e6647c0c..0a9b91516a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/GooglePlayBillingDependencies.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/GooglePlayBillingDependencies.kt
@@ -6,8 +6,8 @@
 package org.thoughtcrime.securesms.dependencies
 
 import android.content.Context
-import org.signal.billing.BillingError
 import org.signal.core.util.billing.BillingDependencies
+import org.signal.core.util.billing.BillingError
 import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
 import java.util.Locale
 
diff --git a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt b/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
index 1bfd3b30fb..c58b928872 100644
--- a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
+++ b/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.signal.core.util.billing.BillingApi
 import org.signal.core.util.billing.BillingDependencies
+import org.signal.core.util.billing.BillingError
 import org.signal.core.util.billing.BillingProduct
 import org.signal.core.util.billing.BillingPurchaseResult
 import org.signal.core.util.logging.Log
diff --git a/billing/src/main/java/org/signal/billing/BillingError.kt b/core-util/src/main/java/org/signal/core/util/billing/BillingError.kt
similarity index 81%
rename from billing/src/main/java/org/signal/billing/BillingError.kt
rename to core-util/src/main/java/org/signal/core/util/billing/BillingError.kt
index 8bf51077bd..ed63dee1bc 100644
--- a/billing/src/main/java/org/signal/billing/BillingError.kt
+++ b/core-util/src/main/java/org/signal/core/util/billing/BillingError.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.signal.billing
+package org.signal.core.util.billing
 
 class BillingError(
   val billingResponseCode: Int