Pass transaction reference and ID to callbacks for exception reporting

michael-paystack · michael-paystack · commit 5c39b3aa4d9c · 2023-11-21T10:14:29.000+01:00
diff --git a/paystack/src/main/java/co/paystack/android/Constants.kt b/paystack/src/main/java/co/paystack/android/Constants.kt
@@ -0,0 +1,4 @@
+package co.paystack.android
+
+const val DEPRECATION_MESSAGE =
+    "This SDK has been deprecated, Please refer to our new SDK: https://github.com/PaystackHQ/paystack-sdk-android"
diff --git a/paystack/src/main/java/co/paystack/android/Paystack.java b/paystack/src/main/java/co/paystack/android/Paystack.java
@@ -1,12 +1,15 @@
 package co.paystack.android;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import android.app.Activity;
 
 import co.paystack.android.exceptions.AuthenticationException;
 import co.paystack.android.exceptions.PaystackSdkNotInitializedException;
 import co.paystack.android.model.Charge;
 import co.paystack.android.model.PaystackModel;
 import co.paystack.android.utils.Utils;
+import kotlin.Deprecated;
 
 /**
  * This is the Paystack model class.\n
@@ -16,6 +19,7 @@
  *
  * @author {androidsupport@paystack.co} on 9/16/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class Paystack extends PaystackModel {
 
     private String publicKey;
@@ -53,6 +57,7 @@ private void validatePublicKey(String publicKey) throws AuthenticationException
 
     }
 
+    @Deprecated(message = DEPRECATION_MESSAGE)
     void chargeCard(Activity activity, Charge charge, TransactionCallback transactionCallback) {
         chargeCard(activity, charge, publicKey, transactionCallback);
     }
@@ -79,11 +84,19 @@ private void chargeCard(Activity activity, Charge charge, String publicKey, Tran
     private interface BaseCallback {
     }
 
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public interface TransactionCallback extends BaseCallback {
+        @Deprecated(message = DEPRECATION_MESSAGE)
         void onSuccess(Transaction transaction);
+
+        @Deprecated(message = DEPRECATION_MESSAGE)
         void beforeValidate(Transaction transaction);
+
+        @Deprecated(message = DEPRECATION_MESSAGE)
         void showLoading(Boolean isProcessing);
+
+        @Deprecated(message = DEPRECATION_MESSAGE)
         void onError(Throwable error, Transaction transaction);
     }
 
-}
+}
diff --git a/paystack/src/main/java/co/paystack/android/PaystackSdk.java b/paystack/src/main/java/co/paystack/android/PaystackSdk.java
@@ -1,5 +1,7 @@
 package co.paystack.android;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -8,6 +10,7 @@
 import co.paystack.android.exceptions.PaystackSdkNotInitializedException;
 import co.paystack.android.model.Charge;
 import co.paystack.android.utils.Utils;
+import kotlin.Deprecated;
 
 /**
  * This is the overall paystack sdk manager class.
@@ -72,11 +75,13 @@ private static synchronized void initialize(Context applicationContext, SdkIniti
      *
      * @param context - Application Context
      */
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public static synchronized void initialize(Context context) {
         initialize(context, null);
     }
 
 
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public static boolean isSdkInitialized() {
         return sdkInitialized;
     }
@@ -87,6 +92,7 @@ public static boolean isSdkInitialized() {
      * @return public key
      * @throws PaystackSdkNotInitializedException if the sdk hasn't been initialized
      */
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public static String getPublicKey() throws PaystackSdkNotInitializedException {
         //validate that the sdk has been initialized
         Utils.Validate.validateSdkInitialized();
@@ -99,6 +105,7 @@ public static String getPublicKey() throws PaystackSdkNotInitializedException {
      *
      * @param publicKey - App Developer's public key
      */
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public static void setPublicKey(String publicKey) {
         PaystackSdk.publicKey = publicKey;
     }
@@ -137,6 +144,7 @@ private static void performChecks() {
         Utils.Validate.hasPublicKey();
     }
 
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public static void chargeCard(Activity activity, Charge charge, Paystack.TransactionCallback transactionCallback) {
         if (BuildConfig.DEBUG && (activity == null)) {
             throw new AssertionError("activity must not be null");
@@ -151,6 +159,7 @@ public static void chargeCard(Activity activity, Charge charge, Paystack.Transac
         paystack.chargeCard(activity, charge, transactionCallback);
     }
 
+    @Deprecated(message = DEPRECATION_MESSAGE)
     public interface SdkInitializeCallback {
         void onInitialized();
     }
diff --git a/paystack/src/main/java/co/paystack/android/Transaction.java b/paystack/src/main/java/co/paystack/android/Transaction.java
@@ -1,7 +1,11 @@
 package co.paystack.android;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import co.paystack.android.api.model.TransactionApiResponse;
+import kotlin.Deprecated;
 
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class Transaction {
     private String id;
     private String reference;
diff --git a/paystack/src/main/java/co/paystack/android/TransactionManager.java b/paystack/src/main/java/co/paystack/android/TransactionManager.java
@@ -1,5 +1,6 @@
 package co.paystack.android;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
 import static co.paystack.android.Transaction.EMPTY_TRANSACTION;
 
 import android.app.Activity;
@@ -38,7 +39,9 @@
 import co.paystack.android.ui.PinSingleton;
 import co.paystack.android.utils.Crypto;
 import co.paystack.android.utils.StringUtils;
+import kotlin.Deprecated;
 
+@Deprecated(message = DEPRECATION_MESSAGE)
 class TransactionManager {
 
     private static final String LOG_TAG = TransactionManager.class.getSimpleName();
@@ -468,4 +471,4 @@ protected void onPostExecute(Address address) {
             }
         }
     }
-}
+}
diff --git a/paystack/src/main/java/co/paystack/android/api/ChargeApiCallback.kt b/paystack/src/main/java/co/paystack/android/api/ChargeApiCallback.kt
@@ -1,10 +1,12 @@
 package co.paystack.android.api
 
+import co.paystack.android.DEPRECATION_MESSAGE
 import co.paystack.android.api.model.ChargeResponse
 import co.paystack.android.api.request.ChargeParams
 
+@Deprecated(message = DEPRECATION_MESSAGE)
 interface ChargeApiCallback {
     fun onSuccess(params: ChargeParams, response: ChargeResponse)
 
     fun onError(exception: Throwable, reference: String?)
-}
+}
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/AuthenticationException.java b/paystack/src/main/java/co/paystack/android/exceptions/AuthenticationException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/16/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class AuthenticationException extends PaystackException {
     public AuthenticationException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/CardException.java b/paystack/src/main/java/co/paystack/android/exceptions/CardException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/13/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class CardException extends PaystackException {
 
     public CardException(String message) {
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/ChargeException.java b/paystack/src/main/java/co/paystack/android/exceptions/ChargeException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/25/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class ChargeException extends PaystackException {
     public ChargeException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/ExpiredAccessCodeException.java b/paystack/src/main/java/co/paystack/android/exceptions/ExpiredAccessCodeException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/25/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class ExpiredAccessCodeException extends PaystackException {
     public ExpiredAccessCodeException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/InvalidAmountException.java b/paystack/src/main/java/co/paystack/android/exceptions/InvalidAmountException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * Created by i on 24/08/2016.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class InvalidAmountException extends PaystackException {
 
     private int amount;
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/InvalidEmailException.java b/paystack/src/main/java/co/paystack/android/exceptions/InvalidEmailException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * Created by i on 24/08/2016.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class InvalidEmailException extends PaystackException {
 
     private String email;
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/PaystackActivityNotFoundException.java b/paystack/src/main/java/co/paystack/android/exceptions/PaystackActivityNotFoundException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/22/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class PaystackActivityNotFoundException extends PaystackException {
     public PaystackActivityNotFoundException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/PaystackException.java b/paystack/src/main/java/co/paystack/android/exceptions/PaystackException.java
@@ -1,12 +1,17 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import java.io.Serializable;
 
+import kotlin.Deprecated;
+
 /**
  * Base class for exceptions
  *
  * @author {androidsupport@paystack.co} on 9/13/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class PaystackException extends RuntimeException implements Serializable {
 
     public PaystackException(String message) {
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/PaystackSdkNotInitializedException.java b/paystack/src/main/java/co/paystack/android/exceptions/PaystackSdkNotInitializedException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/22/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class PaystackSdkNotInitializedException extends PaystackException {
     public PaystackSdkNotInitializedException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/ProcessingException.java b/paystack/src/main/java/co/paystack/android/exceptions/ProcessingException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/25/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class ProcessingException extends ChargeException {
     public ProcessingException() {
         super("A transaction is currently processing, please wait till it concludes before attempting a new charge.");
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/TokenException.java b/paystack/src/main/java/co/paystack/android/exceptions/TokenException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * @author {androidsupport@paystack.co} on 9/20/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class TokenException extends PaystackException {
     public TokenException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/exceptions/ValidateException.java b/paystack/src/main/java/co/paystack/android/exceptions/ValidateException.java
@@ -1,8 +1,13 @@
 package co.paystack.android.exceptions;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
+import kotlin.Deprecated;
+
 /**
  * Created by i on 24/08/2016.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class ValidateException extends PaystackException {
     public ValidateException(String message) {
         super(message);
diff --git a/paystack/src/main/java/co/paystack/android/utils/CardUtils.java b/paystack/src/main/java/co/paystack/android/utils/CardUtils.java
@@ -1,16 +1,21 @@
 package co.paystack.android.utils;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import java.util.Calendar;
 import java.util.Locale;
 
+import kotlin.Deprecated;
+
 /**
  * Utils used with the Card model.
  *
  * @author {androidsupport@paystack.co} on 9/13/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class CardUtils {
 
-  public static boolean isWholePositiveNumber(String value) {
+    public static boolean isWholePositiveNumber(String value) {
     if (value == null) {
       return false;
     }
diff --git a/paystack/src/main/java/co/paystack/android/utils/Crypto.java b/paystack/src/main/java/co/paystack/android/utils/Crypto.java
@@ -1,5 +1,7 @@
 package co.paystack.android.utils;
 
+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;
+
 import android.util.Base64;
 
 import java.security.KeyFactory;
@@ -12,13 +14,15 @@
 import javax.crypto.Cipher;
 
 import co.paystack.android.exceptions.AuthenticationException;
+import kotlin.Deprecated;
 
 
 /**
  * Class for encrypting the card details, for token creation.
  *
  * @author {androidsupport@paystack.co} on 8/10/15.
  */
+@Deprecated(message = DEPRECATION_MESSAGE)
 public class Crypto {
     private static final String PAYSTACK_RSA_PUBLIC_KEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALhZs/7hP0g0+hrqTq0hFyGVxgco0NMxZD8nPS6ihxap0yNFjzdyUuZED6P4/aK9Ezl5ajEI9pcx5/1BrEE+F3kCAwEAAQ==";
     private static String ALGORITHM = "RSA";
diff --git a/paystack/src/main/java/co/paystack/android/utils/Logger.java b/paystack/src/main/java/co/paystack/android/utils/Logger.java
diff --git a/paystack/src/main/java/co/paystack/android/utils/StringUtils.java b/paystack/src/main/java/co/paystack/android/utils/StringUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package co.paystack.android;`
`2`	`2`
	`3`	`+import static co.paystack.android.ConstantsKt.DEPRECATION_MESSAGE;`
`3`	`4`	`import static co.paystack.android.Transaction.EMPTY_TRANSACTION;`
`4`	`5`
`5`	`6`	`import android.app.Activity;`
`@@ -38,7 +39,9 @@`
`38`	`39`	`import co.paystack.android.ui.PinSingleton;`
`39`	`40`	`import co.paystack.android.utils.Crypto;`
`40`	`41`	`import co.paystack.android.utils.StringUtils;`
	`42`	`+import kotlin.Deprecated;`
`41`	`43`
	`44`	`+@Deprecated(message = DEPRECATION_MESSAGE)`
`42`	`45`	`class TransactionManager {`
`43`	`46`
`44`	`47`	`private static final String LOG_TAG = TransactionManager.class.getSimpleName();`
`@@ -468,4 +471,4 @@ protected void onPostExecute(Address address) {`
`468`	`471`	`}`
`469`	`472`	`}`
`470`	`473`	`}`
`471`		`-}`
	`474`	`+}`