From 3e5ced802d81efe9b9ca7c07054b5c1045f27dfe Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Tue, 11 Apr 2023 10:30:36 -0700 Subject: [PATCH] Rename SlicePurchaseWebInterface to DataBoostWebServiceFlow Also remove duration parameter from notifyPurchaseSuccessful Changed to be consistent with the TS.43 specs Test: manual verify no regression of purchase behavior Test: atest CarrierDefaultAppTest Bug: 283210989 Change-Id: I6d93ca848495e1e2657518d12b61f4ab9796a035 --- .../assets/slice_purchase_test.html | 6 ++--- .../assets/slice_purchase_test.js | 10 ++++----- ...face.java => DataBoostWebServiceFlow.java} | 20 ++++++++--------- .../SlicePurchaseActivity.java | 22 +++++++------------ .../SlicePurchaseActivityTest.java | 15 ++++++------- 5 files changed, 32 insertions(+), 41 deletions(-) rename packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/{SlicePurchaseWebInterface.java => DataBoostWebServiceFlow.java} (79%) diff --git a/packages/CarrierDefaultApp/assets/slice_purchase_test.html b/packages/CarrierDefaultApp/assets/slice_purchase_test.html index 67d218413e74e..d2c1c04265bf0 100644 --- a/packages/CarrierDefaultApp/assets/slice_purchase_test.html +++ b/packages/CarrierDefaultApp/assets/slice_purchase_test.html @@ -20,7 +20,7 @@

Notify purchase successful

-

diff --git a/packages/CarrierDefaultApp/assets/slice_purchase_test.js b/packages/CarrierDefaultApp/assets/slice_purchase_test.js index 02c4feac7ee45..84ab1f9338389 100644 --- a/packages/CarrierDefaultApp/assets/slice_purchase_test.js +++ b/packages/CarrierDefaultApp/assets/slice_purchase_test.js @@ -15,19 +15,19 @@ */ function testGetRequestedCapability() { - let capability = SlicePurchaseWebInterface.getRequestedCapability(); + let capability = DataBoostWebServiceFlow.getRequestedCapability(); document.getElementById("requested_capability").innerHTML = "Premium capability requested: " + capability; } -function testNotifyPurchaseSuccessful(duration_ms_long = 0) { - SlicePurchaseWebInterface.notifyPurchaseSuccessful(duration_ms_long); +function testNotifyPurchaseSuccessful() { + DataBoostWebServiceFlow.notifyPurchaseSuccessful(); document.getElementById("purchase_successful").innerHTML = - "Notified purchase success for duration: " + duration_ms_long; + "Notified purchase successful."; } function testNotifyPurchaseFailed(failure_code = 0, failure_reason = "unknown") { - SlicePurchaseWebInterface.notifyPurchaseFailed(failure_code, failure_reason); + DataBoostWebServiceFlow.notifyPurchaseFailed(failure_code, failure_reason); document.getElementById("purchase_failed").innerHTML = "Notified purchase failed."; } diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseWebInterface.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/DataBoostWebServiceFlow.java similarity index 79% rename from packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseWebInterface.java rename to packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/DataBoostWebServiceFlow.java index 8547898df678e..0aadd31b6e18b 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseWebInterface.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/DataBoostWebServiceFlow.java @@ -24,13 +24,13 @@ import android.webkit.JavascriptInterface; import com.android.phone.slice.SlicePurchaseController; /** - * Slice purchase web interface class allowing carrier websites to send responses back to the + * Data boost web service flow interface allowing carrier websites to send responses back to the * slice purchase application using JavaScript. */ -public class SlicePurchaseWebInterface { +public class DataBoostWebServiceFlow { @NonNull SlicePurchaseActivity mActivity; - public SlicePurchaseWebInterface(@NonNull SlicePurchaseActivity activity) { + public DataBoostWebServiceFlow(@NonNull SlicePurchaseActivity activity) { mActivity = activity; } @@ -41,7 +41,7 @@ public class SlicePurchaseWebInterface { * This can be called using the JavaScript below: * */ @@ -57,16 +57,14 @@ public class SlicePurchaseWebInterface { * * This can be called using the JavaScript below: * - * - * @param duration The duration for which the premium capability is purchased in milliseconds. */ @JavascriptInterface - public void notifyPurchaseSuccessful(long duration) { - mActivity.onPurchaseSuccessful(duration); + public void notifyPurchaseSuccessful() { + mActivity.onPurchaseSuccessful(); } /** @@ -76,7 +74,7 @@ public class SlicePurchaseWebInterface { * This can be called using the JavaScript below: * * diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java index 946185a3c4203..d304394dacb7f 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java @@ -32,21 +32,19 @@ import android.webkit.WebView; import com.android.phone.slice.SlicePurchaseController; import java.net.URL; -import java.util.concurrent.TimeUnit; /** * Activity that launches when the user clicks on the performance boost notification. * This will open a {@link WebView} for the carrier website to allow the user to complete the * premium capability purchase. * The carrier website can get the requested premium capability using the JavaScript interface - * method {@code SlicePurchaseWebInterface.getRequestedCapability()}. + * method {@code DataBoostWebServiceFlow.getRequestedCapability()}. * If the purchase is successful, the carrier website shall notify the slice purchase application * using the JavaScript interface method - * {@code SlicePurchaseWebInterface.notifyPurchaseSuccessful(duration)}, where {@code duration} is - * the optional duration of the performance boost. + * {@code DataBoostWebServiceFlow.notifyPurchaseSuccessful()}. * If the purchase was not successful, the carrier website shall notify the slice purchase * application using the JavaScript interface method - * {@code SlicePurchaseWebInterface.notifyPurchaseFailed(code, reason)}, where {@code code} is the + * {@code DataBoostWebServiceFlow.notifyPurchaseFailed(code, reason)}, where {@code code} is the * {@link SlicePurchaseController.FailureCode} indicating the reason for failure and {@code reason} * is the human-readable reason for failure if the failure code is * {@link SlicePurchaseController#FAILURE_CODE_UNKNOWN}. @@ -118,15 +116,11 @@ public class SlicePurchaseActivity extends Activity { setupWebView(); } - protected void onPurchaseSuccessful(long duration) { + protected void onPurchaseSuccessful() { logd("onPurchaseSuccessful: Carrier website indicated successfully purchased premium " - + "capability " + TelephonyManager.convertPremiumCapabilityToString(mCapability) - + (duration > 0 ? " for " + TimeUnit.MILLISECONDS.toMinutes(duration) + " minutes." - : ".")); - Intent intent = new Intent(); - intent.putExtra(SlicePurchaseController.EXTRA_PURCHASE_DURATION, duration); - SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponseWithData(mApplicationContext, - mIntent, SlicePurchaseController.EXTRA_INTENT_SUCCESS, intent); + + "capability " + TelephonyManager.convertPremiumCapabilityToString(mCapability)); + SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse( + mIntent, SlicePurchaseController.EXTRA_INTENT_SUCCESS); finishAndRemoveTask(); } @@ -178,7 +172,7 @@ public class SlicePurchaseActivity extends Activity { // the slice purchase application. mWebView.getSettings().setJavaScriptEnabled(true); mWebView.addJavascriptInterface( - new SlicePurchaseWebInterface(this), "SlicePurchaseWebInterface"); + new DataBoostWebServiceFlow(this), "DataBoostWebServiceFlow"); // Display WebView setContentView(mWebView); diff --git a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java index daf0b42dbd7c6..e7a75e58105d8 100644 --- a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java +++ b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java @@ -53,6 +53,7 @@ public class SlicePurchaseActivityTest extends ActivityUnitTestCase intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mPendingIntent).send(eq(mContext), eq(0), intentCaptor.capture()); - Intent intent = intentCaptor.getValue(); - assertEquals(duration, intent.getLongExtra( - SlicePurchaseController.EXTRA_PURCHASE_DURATION, invalidDuration)); + mSlicePurchaseActivity.onPurchaseSuccessful(); + verify(mSuccessfulIntent).send(); } @Test