Merge branch '331-adjust-receipt-attachments-handling' into 'master'

Resolve "Adjust receipt attachments handling"

Closes #331

See merge request pace/mobile/android/pace-cloud-sdk!359

Author: MelissaAtPace

library/src/main/java/cloud/pace/sdk/appkit/app/webview/AppWebViewModel.kt

@@ -951,7 +951,7 @@ class AppWebViewModelImpl(
             ReceiptAttachmentsResult(ReceiptAttachmentsResult.Failure(ReceiptAttachmentsResult.Failure.StatusCode.RequestTimeout, ReceiptAttachmentsError("Timeout for receiptAttachments"))),
             ReceiptAttachmentsResult(ReceiptAttachmentsResult.Failure(ReceiptAttachmentsResult.Failure.StatusCode.InternalServerError, ReceiptAttachmentsError("An error occurred")))
         ) { continuation ->
-            appModel.onReceiptAttachmentsRequestReceived(receiptAttachmentsRequest.paymentMethod) {
+            appModel.onReceiptAttachmentsRequestReceived(context, receiptAttachmentsRequest.paymentMethod) {
                 continuation.resumeIfActive(ReceiptAttachmentsResult(ReceiptAttachmentsResult.Success(ReceiptAttachmentsResponse(it))))
             }
         }

library/src/main/java/cloud/pace/sdk/appkit/communication/AppCallback.kt

@@ -188,10 +188,11 @@ interface AppCallback {
     /**
      * Is called when the app asks for additional attachments that should be printed on the fueling receipt
      *
+     * @param context The [cloud.pace.sdk.appkit.app.AppActivity] context.
      * @param paymentMethod For which payment method the attachments are requested
      * @param attachments Call this function to specify attachments or not
      */
-    fun onReceiptAttachmentsRequestReceived(paymentMethod: String, attachments: (List<String>?) -> Unit)
+    fun onReceiptAttachmentsRequestReceived(context: Context, paymentMethod: String, attachments: (List<String>?) -> Unit)
 }
 
 abstract class AppCallbackImpl : AppCallback, CloudSDKKoinComponent {
@@ -256,7 +257,7 @@ abstract class AppCallbackImpl : AppCallback, CloudSDKKoinComponent {
         email(null)
     }
 
-    override fun onReceiptAttachmentsRequestReceived(paymentMethod: String, attachments: (List<String>?) -> Unit) {
+    override fun onReceiptAttachmentsRequestReceived(context: Context, paymentMethod: String, attachments: (List<String>?) -> Unit) {
         attachments(null)
     }
 }

library/src/main/java/cloud/pace/sdk/appkit/communication/AppModel.kt

@@ -75,7 +75,7 @@ interface AppModel {
     fun onGooglePayPayment(googlePayPaymentRequest: GooglePayPaymentRequest, onResult: (Completion<GooglePayPaymentResponse>) -> Unit)
     fun onNavigationRequestReceived(lat: Double, lon: Double, name: String)
     fun onReceiptEmailRequestReceived(paymentMethod: String, email: (String?) -> Unit)
-    fun onReceiptAttachmentsRequestReceived(paymentMethod: String, attachments: (List<String>?) -> Unit)
+    fun onReceiptAttachmentsRequestReceived(context: Context, paymentMethod: String, attachments: (List<String>?) -> Unit)
 
     class Result<T>(val onResult: (T) -> Unit)
 }
@@ -394,9 +394,9 @@ class AppModelImpl(
         }
     }
 
-    override fun onReceiptAttachmentsRequestReceived(paymentMethod: String, attachments: (List<String>?) -> Unit) {
+    override fun onReceiptAttachmentsRequestReceived(context: Context, paymentMethod: String, attachments: (List<String>?) -> Unit) {
         coroutineScope.launch {
-            callback?.onReceiptAttachmentsRequestReceived(paymentMethod, attachments)
+            callback?.onReceiptAttachmentsRequestReceived(context, paymentMethod, attachments)
         }
     }