Surface 30-day trial on welcome license-entry page for apkstore/fdroid/lite

Author: tobihagemann

buildsystem/dependencies.gradle

@@ -110,12 +110,14 @@ ext {
 	// testing dependencies
 
 	jUnitVersion = '5.11.4'
+	jUnit4Version = '4.13.2'
 	assertJVersion = '1.7.1'
 	mockitoVersion = '5.18.0'
 	mockitoKotlinVersion = '6.0.0'
 	mockitoInlineVersion = '5.2.0'
 	mockitoAndroidVersion = '5.18.0'
 	hamcrestVersion = '1.3'
+	robolectricVersion = '4.15'
 	dexmakerVersion = '1.0'
 	espressoVersion = '3.7.0'
 	testingSupportLibVersion = '0.1'
@@ -151,6 +153,7 @@ ext {
 			appauth                        : "net.openid:appauth:${appauthVersion}",
 			documentFile                   : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}",
 			recyclerView                   : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}",
+			robolectric                    : "org.robolectric:robolectric:${robolectricVersion}",
 			androidxSplashscreen           : "androidx.core:core-splashscreen:${androidxSplashscreenVersion}",
 			androidxTestCore               : "androidx.test:core:${androidxTestCoreVersion}",
 			androidxTestJunitKtln          : "androidx.test.ext:junit-ktx:${androidxTestJunitKtlnVersion}",
@@ -177,6 +180,7 @@ ext {
 			junitApi                       : "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}",
 			junitEngine                    : "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}",
 			junitParams                    : "org.junit.jupiter:junit-jupiter-params:${jUnitVersion}",
+			junit4                         : "junit:junit:${jUnit4Version}",
 			junit4Engine                   : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}",
 			minIo                          : "io.minio:minio:${minIoVersion}",
 			mockito                        : "org.mockito:mockito-core:${mockitoVersion}",

presentation/build.gradle

@@ -162,6 +162,12 @@ android {
 		quiet true
 	}
 
+	testOptions {
+		unitTests {
+			includeAndroidResources = true
+		}
+	}
+
 	namespace 'org.cryptomator.presentation'
 }
 
@@ -278,6 +284,7 @@ dependencies {
 
 	androidTestImplementation dependencies.runner
 	androidTestImplementation dependencies.androidAnnotations
+	androidTestImplementation dependencies.androidxTestJunitKtln
 
 
 	testImplementation dependencies.junit
@@ -290,6 +297,9 @@ dependencies {
 	testImplementation dependencies.mockitoKotlin
 	testImplementation dependencies.mockitoInline
 	testImplementation dependencies.hamcrest
+	testImplementation dependencies.robolectric
+	testImplementation dependencies.androidxTestCore
+	testImplementation dependencies.junit4
 }
 
 configurations {

presentation/src/androidTestApkstore/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivityTrialScopeGuardTest.kt

@@ -0,0 +1,61 @@
+package org.cryptomator.presentation.ui.activity
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.cryptomator.presentation.R
+import org.cryptomator.presentation.intent.Intents
+import org.cryptomator.presentation.licensing.LicenseEnforcer
+import org.cryptomator.presentation.presenter.ContextHolder
+import org.cryptomator.util.SharedPreferencesHandler
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.not
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+@RunWith(AndroidJUnit4::class)
+class LicenseCheckActivityTrialScopeGuardTest {
+
+	private val targetContext by lazy { InstrumentationRegistry.getInstrumentation().targetContext }
+	private val prefs by lazy { SharedPreferencesHandler(targetContext) }
+
+	@Before
+	fun seedActiveTrial() {
+		prefs.setTrialExpirationDate(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(15))
+		prefs.setTrialExpired(false)
+	}
+
+	@After
+	fun clearTrialState() {
+		prefs.setTrialExpirationDate(0L)
+		prefs.setTrialExpired(false)
+	}
+
+	@Test
+	fun licenseCheckActivity_onApkstore_hidesTrialRow_evenWithLatchedActiveTrial() {
+		val contextHolder = object : ContextHolder {
+			override fun context() = targetContext
+		}
+		val intent = Intents.licenseCheckIntent()
+			.withLockedAction(LicenseEnforcer.LockedAction.CREATE_VAULT.name)
+			.build(contextHolder)
+
+		ActivityScenario.launch<LicenseCheckActivity>(intent).use {
+			onView(withId(R.id.purchaseOptionsGroup)).check(matches(not(isDisplayed())))
+			onView(withId(R.id.rowTrial)).check(matches(not(isDisplayed())))
+			onView(withId(R.id.tvInfoText)).check(
+				matches(allOf(isDisplayed(), withText(R.string.screen_license_check_locked_create_vault)))
+			)
+			onView(withId(R.id.tvTrialStatusBadge)).check(matches(not(isDisplayed())))
+			onView(withId(R.id.tvTrialExpiration)).check(matches(not(isDisplayed())))
+		}
+	}
+}

presentation/src/main/java/org/cryptomator/presentation/ui/activity/WelcomeActivity.kt

@@ -66,6 +66,14 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>(ActivityWelcomeBind
 						return
 					}
 					pagerAdapter.licenseFragment?.updateUnlocked(hasWriteAccess, hasPaidLicense)
+					if (!FlavorConfig.isPremiumFlavor && !FlavorConfig.isFreemiumFlavor && !hasPaidLicense) {
+						val uiState = licenseEnforcer.evaluateUiState(this@WelcomeActivity)
+						pagerAdapter.licenseFragment?.updateTrialState(
+							uiState.trialState.isActive,
+							uiState.trialState.isExpired,
+							uiState.trialExpirationText
+						)
+					}
 				}
 				override fun onTrialStateChanged(active: Boolean, expired: Boolean, expirationText: String?) {
 					if (!this@WelcomeActivity::pagerAdapter.isInitialized) {
@@ -160,11 +168,7 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>(ActivityWelcomeBind
 			override fun onPageSelected(position: Int) {
 				updateNavigationButtons(position)
 				when (pages[position]) {
-					is FragmentPage.License -> {
-						if (FlavorConfig.isFreemiumFlavor) {
-							orchestrator.updateState()
-						}
-					}
+					is FragmentPage.License -> orchestrator.updateState()
 					is FragmentPage.Notifications -> updateNotificationPermissionState()
 					is FragmentPage.ScreenLock -> updateScreenLockState()
 					is FragmentPage.Intro -> Unit

presentation/src/main/java/org/cryptomator/presentation/ui/fragment/WelcomeLicenseFragment.kt

@@ -61,7 +61,9 @@ class WelcomeLicenseFragment : BaseFragment<FragmentWelcomeLicenseBinding>(Fragm
 	}
 
 	private fun setupLicenseEntryUi() {
-		licenseContentViewBinder.bindInitialLicenseEntryLayout()
+		licenseContentViewBinder.bindInitialLicenseEntryWithTrialLayout()
+		binding.licenseContent.btnTrial.text = getString(R.string.screen_welcome_trial_button)
+		binding.licenseContent.btnTrial.setOnClickListener { listener?.onStartTrial() }
 		binding.licenseContent.tvLicenseLink.setOnClickListener { listener?.onOpenLicenseLink() }
 		binding.licenseContent.btnPurchase.visibility = View.GONE
 		binding.licenseContent.etLicense.addTextChangedListener(object : TextWatcher {

presentation/src/main/java/org/cryptomator/presentation/ui/layout/LicenseContentViewBinder.kt

@@ -44,6 +44,17 @@ class LicenseContentViewBinder(
 		binding.tvLicenseLink.text = context.getString(R.string.dialog_enter_license_content)
 	}
 
+	/** Sets the initial visibility state for license-entry mode with the trial row visible (welcome flow only). */
+	fun bindInitialLicenseEntryWithTrialLayout() {
+		bindInitialLicenseEntryLayout()
+		binding.purchaseOptionsGroup.visibility = View.VISIBLE
+		binding.rowSubscription.visibility = View.GONE
+		binding.rowLifetime.visibility = View.GONE
+		binding.dividerTrialSubscription.visibility = View.GONE
+		binding.dividerSubscriptionLifetime.visibility = View.GONE
+		binding.rowTrial.visibility = View.VISIBLE
+	}
+
 	/** Sets click listeners on Terms and Privacy links. */
 	fun bindLegalLinks() {
 		binding.tvTerms.setOnClickListener {
@@ -114,6 +125,10 @@ class LicenseContentViewBinder(
 			}
 		} else {
 			binding.btnPurchase.isEnabled = !unlocked
+			if (hasPaidLicense) {
+				binding.rowTrial.visibility = View.GONE
+				binding.tvInfoText.visibility = View.GONE
+			}
 		}
 	}
 

presentation/src/main/res/layout/view_license_check_content.xml

@@ -225,6 +225,7 @@
 		</LinearLayout>
 
 		<View
+			android:id="@+id/dividerTrialSubscription"
 			android:layout_width="match_parent"
 			android:layout_height="1dp"
 			android:background="?android:attr/listDivider" />
@@ -273,6 +274,7 @@
 		</LinearLayout>
 
 		<View
+			android:id="@+id/dividerSubscriptionLifetime"
 			android:layout_width="match_parent"
 			android:layout_height="1dp"
 			android:background="?android:attr/listDivider" />

presentation/src/main/res/values/strings.xml

@@ -107,6 +107,7 @@
 	<string name="screen_welcome_screen_lock_button">Set screen lock</string>
 	<string name="screen_welcome_screen_lock_already_set">Screen lock is already set.</string>
 	<string name="screen_welcome_intro_body">Thanks for choosing Cryptomator to protect your files.\n\nWith Cryptomator, the key to your data is in your hands.\n\nCryptomator encrypts your data quickly and easily.</string>
+	<string name="screen_welcome_trial_button" translatable="false">@string/screen_license_check_trial_price</string>
 	<string name="next">Next</string>
 	<string name="back">Back</string>
 	<string name="screen_settings_license_unlock_prompt">Unlock write access</string>

presentation/src/test/java/org/cryptomator/presentation/ui/layout/LicenseContentViewBinderTest.kt

@@ -0,0 +1,106 @@
+package org.cryptomator.presentation.ui.layout
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import androidx.test.core.app.ApplicationProvider
+import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ViewLicenseCheckContentBinding
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class LicenseContentViewBinderTest {
+
+	private lateinit var binding: ViewLicenseCheckContentBinding
+	private lateinit var context: Context
+
+	@Before
+	fun setUp() {
+		context = ApplicationProvider.getApplicationContext()
+		context.setTheme(R.style.AppTheme)
+		binding = ViewLicenseCheckContentBinding.inflate(LayoutInflater.from(context))
+	}
+
+	@Test
+	fun `bindTrialState with no trial shows trial button group and hides badge and expiration`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = false)
+
+		binder.bindTrialState(active = false, expired = false, expirationText = null)
+
+		assertThat(binding.trialButtonGroup.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvTrialStatusBadge.visibility, `is`(View.GONE))
+		assertThat(binding.tvTrialExpiration.visibility, `is`(View.GONE))
+		assertThat(binding.btnTrial.isEnabled, `is`(true))
+	}
+
+	@Test
+	fun `bindTrialState with active trial hides button and shows active badge and expiration`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = false)
+		val expirationText = "Expiration Date: 2026-05-19"
+
+		binder.bindTrialState(active = true, expired = false, expirationText = expirationText)
+
+		assertThat(binding.trialButtonGroup.visibility, `is`(View.GONE))
+		assertThat(binding.tvTrialStatusBadge.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvTrialStatusBadge.text.toString(), `is`(context.getString(R.string.screen_license_check_trial_status_active)))
+		assertThat(binding.tvTrialExpiration.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvTrialExpiration.text.toString(), `is`(expirationText))
+		assertThat(binding.tvInfoText.visibility, `is`(View.GONE))
+	}
+
+	@Test
+	fun `bindTrialState with expired trial shows expired badge and info text`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = false)
+		val expirationText = "Expiration Date: 2026-03-19"
+
+		binder.bindTrialState(active = false, expired = true, expirationText = expirationText)
+
+		assertThat(binding.trialButtonGroup.visibility, `is`(View.GONE))
+		assertThat(binding.tvTrialStatusBadge.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvTrialStatusBadge.text.toString(), `is`(context.getString(R.string.screen_license_check_trial_status_expired)))
+		assertThat(binding.tvTrialExpiration.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvTrialExpiration.text.toString(), `is`(expirationText))
+		assertThat(binding.tvInfoText.visibility, `is`(View.VISIBLE))
+		assertThat(binding.tvInfoText.text.toString(), `is`(context.getString(R.string.screen_license_check_trial_expired_info)))
+	}
+
+	@Test
+	fun `bindPurchaseState on non-freemium with paid license hides trial row and info text and disables purchase button`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = false)
+
+		binder.bindPurchaseState(unlocked = true, hasPaidLicense = true)
+
+		assertThat(binding.rowTrial.visibility, `is`(View.GONE))
+		assertThat(binding.tvInfoText.visibility, `is`(View.GONE))
+		assertThat(binding.btnPurchase.isEnabled, `is`(false))
+	}
+
+	@Test
+	fun `bindPurchaseState on freemium with paid license hides purchase options and trial surfaces`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = true)
+
+		binder.bindPurchaseState(unlocked = true, hasPaidLicense = true)
+
+		assertThat(binding.purchaseOptionsGroup.visibility, `is`(View.GONE))
+		assertThat(binding.tvRestorePurchase.visibility, `is`(View.GONE))
+		assertThat(binding.tvInfoText.visibility, `is`(View.GONE))
+		assertThat(binding.tvTrialStatusBadge.visibility, `is`(View.GONE))
+		assertThat(binding.tvTrialExpiration.visibility, `is`(View.GONE))
+	}
+
+	@Test
+	fun `transitioning from expired trial to paid license clears info text`() {
+		val binder = LicenseContentViewBinder(binding, isFreemiumFlavor = false)
+
+		binder.bindTrialState(active = false, expired = true, expirationText = "Expiration Date: 2026-03-19")
+		binder.bindPurchaseState(unlocked = true, hasPaidLicense = true)
+
+		assertThat(binding.rowTrial.visibility, `is`(View.GONE))
+		assertThat(binding.tvInfoText.visibility, `is`(View.GONE))
+	}
+}