Add restore option

duckduckgo · Nov 24, 2023 · 6c906ce · 6c906ce
1 parent 1d3ceae
commit 6c906ce
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/...ubscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt b/...ubscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
@@ -82,6 +82,11 @@ interface SubscriptionsManager {
      */
     suspend fun getAccessToken(): AccessToken
 
+    /**
+     * Returns [true] if the user has an active subscription and [false] otherwise
+     */
+    suspend fun hasSubscription(): Boolean
+
     /**
      * Flow to know if a user is signed in or not
      */
@@ -93,7 +98,7 @@ interface SubscriptionsManager {
     val hasSubscription: Flow<Boolean>
 
     /**
-     * Flow to know if a user is signed in or not
+     * Flow to know the state of the current purchase
      */
     val currentPurchaseState: Flow<CurrentPurchase>
 
@@ -173,10 +178,11 @@ class RealSubscriptionsManager @Inject constructor(
         _hasSubscription.emit(hasSubscription)
     }
 
-    private suspend fun hasSubscription(): Boolean {
+    override suspend fun hasSubscription(): Boolean {
         return when (val result = getSubscriptionData()) {
             is Success -> {
                 val isSubscribed = result.entitlements.isNotEmpty()
+                _hasSubscription.emit(isSubscribed)
                 isSubscribed
             }
             is Failure -> {

diff --git a/...s-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionWebViewViewModel.kt b/...s-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionWebViewViewModel.kt
@@ -101,13 +101,23 @@ class SubscriptionWebViewViewModel @Inject constructor(
             "backToSettings" -> backToSettings()
             "getSubscriptionOptions" -> id?.let { getSubscriptionOptions(featureName, method, it) }
             "subscriptionSelected" -> subscriptionSelected(data)
-            "activateSubscription" -> activateOnAnotherDevice()
+            "activateSubscription" -> activateSubscription()
             else -> {
                 // NOOP
             }
         }
     }
 
+    private fun activateSubscription() {
+        viewModelScope.launch(dispatcherProvider.io()) {
+            if (subscriptionsManager.hasSubscription()) {
+                activateOnAnotherDevice()
+            } else {
+                recoverSubscription()
+            }
+        }
+    }
+
     private fun subscriptionSelected(data: JSONObject?) {
         viewModelScope.launch(dispatcherProvider.io()) {
             val id = runCatching { data?.getString("id") }.getOrNull()
@@ -159,6 +169,12 @@ class SubscriptionWebViewViewModel @Inject constructor(
         }
     }
 
+    private fun recoverSubscription() {
+        viewModelScope.launch {
+            command.send(RestoreSubscription)
+        }
+    }
+
     private fun activateOnAnotherDevice() {
         viewModelScope.launch {
             command.send(ActivateOnAnotherDevice)
@@ -198,6 +214,7 @@ class SubscriptionWebViewViewModel @Inject constructor(
         data class SendResponseToJs(val data: JsCallbackData) : Command()
         data class SubscriptionSelected(val id: String) : Command()
         data object ActivateOnAnotherDevice : Command()
+        data object RestoreSubscription : Command()
     }
 
     companion object {

diff --git a/...s-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionsWebViewActivity.kt b/...s-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionsWebViewActivity.kt
@@ -42,9 +42,11 @@ import com.duckduckgo.navigation.api.getActivityParams
 import com.duckduckgo.subscriptions.impl.R.string
 import com.duckduckgo.subscriptions.impl.databinding.ActivitySubscriptionsWebviewBinding
 import com.duckduckgo.subscriptions.impl.ui.AddDeviceActivity.Companion.AddDeviceScreenWithEmptyParams
+import com.duckduckgo.subscriptions.impl.ui.RestoreSubscriptionActivity.Companion.RestoreSubscriptionScreenWithEmptyParams
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command.ActivateOnAnotherDevice
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command.BackToSettings
+import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command.RestoreSubscription
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command.SendResponseToJs
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.Command.SubscriptionSelected
 import com.duckduckgo.subscriptions.impl.ui.SubscriptionWebViewViewModel.PurchaseStateView
@@ -141,6 +143,7 @@ class SubscriptionsWebViewActivity : DuckDuckGoActivity() {
             is SendResponseToJs -> sendResponseToJs(command.data)
             is SubscriptionSelected -> selectSubscription(command.id)
             is ActivateOnAnotherDevice -> activateOnAnotherDevice()
+            is RestoreSubscription -> restoreSubscription()
         }
     }
 
@@ -234,6 +237,10 @@ class SubscriptionsWebViewActivity : DuckDuckGoActivity() {
         globalActivityStarter.start(this, AddDeviceScreenWithEmptyParams)
     }
 
+    private fun restoreSubscription() {
+        globalActivityStarter.start(this, RestoreSubscriptionScreenWithEmptyParams)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {

diff --git a/...pl/src/test/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionWebViewViewModelTest.kt b/...pl/src/test/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionWebViewViewModelTest.kt
@@ -149,13 +149,23 @@ class SubscriptionWebViewViewModelTest {
     }
 
     @Test
-    fun whenActivateSubscriptionThenCommandSent() = runTest {
+    fun whenActivateSubscriptionAndSubscriptionActiveThenCommandSent() = runTest {
+        whenever(subscriptionsManager.hasSubscription()).thenReturn(true)
         viewModel.commands().test {
             viewModel.processJsCallbackMessage("test", "activateSubscription", null, null)
             assertTrue(awaitItem() is Command.ActivateOnAnotherDevice)
         }
     }
 
+    @Test
+    fun whenActivateSubscriptionAndSubscriptionInactiveThenCommandSent() = runTest {
+        whenever(subscriptionsManager.hasSubscription()).thenReturn(false)
+        viewModel.commands().test {
+            viewModel.processJsCallbackMessage("test", "activateSubscription", null, null)
+            assertTrue(awaitItem() is Command.RestoreSubscription)
+        }
+    }
+
     private fun getSubscriptionOfferDetails(planId: String): SubscriptionOfferDetails {
         val subscriptionOfferDetails: SubscriptionOfferDetails = mock()
         whenever(subscriptionOfferDetails.basePlanId).thenReturn(planId)