Consolidate trial-state evaluation into a single method

Inline observeTrialExpiry latch into evaluateTrialState, route
hasActiveTrial and evaluateUiState through the single computation.
Halves prefs reads on write-gate checks.

Author: tobihagemann

presentation/src/main/java/org/cryptomator/presentation/licensing/LicenseEnforcer.kt

@@ -64,27 +64,19 @@ class LicenseEnforcer @Inject constructor(private val sharedPreferencesHandler:
 		sharedPreferencesHandler.setTrialExpirationDate(trialExpiration)
 	}
 
-	private fun observeTrialExpiry() {
-		val trialExpiration = sharedPreferencesHandler.trialExpirationDate()
-		val now = System.currentTimeMillis()
-		if (trialExpiration > 0 && trialExpiration <= now && !sharedPreferencesHandler.isTrialExpired()) {
-			sharedPreferencesHandler.setTrialExpired(true)
-		}
-	}
-
 	fun hasActiveTrial(): Boolean {
-		observeTrialExpiry()
-		val trialExpiration = sharedPreferencesHandler.trialExpirationDate()
-		return trialExpiration > 0 && trialExpiration > System.currentTimeMillis() && !sharedPreferencesHandler.isTrialExpired()
+		return evaluateTrialState().isActive
 	}
 
 	fun evaluateTrialState(): TrialState {
-		observeTrialExpiry()
 		val trialExpiration = sharedPreferencesHandler.trialExpirationDate()
 		val now = System.currentTimeMillis()
 		val sticky = sharedPreferencesHandler.isTrialExpired()
 		val active = trialExpiration > 0 && trialExpiration > now && !sticky
 		val expired = trialExpiration > 0 && (trialExpiration <= now || sticky)
+		if (expired && !sticky) {
+			sharedPreferencesHandler.setTrialExpired(true)
+		}
 		val formattedDate = if (active || expired) {
 			DateFormat.getDateInstance().format(Date(trialExpiration))
 		} else null
@@ -102,12 +94,13 @@ class LicenseEnforcer @Inject constructor(private val sharedPreferencesHandler:
 
 	fun evaluateUiState(context: Context): LicenseUiState {
 		val trialState = evaluateTrialState()
+		val paidLicense = hasPaidLicense()
 		val expirationText = if (trialState.isActive || trialState.isExpired) {
 			context.getString(R.string.screen_license_check_trial_expiration, trialState.formattedExpirationDate)
 		} else null
 		return LicenseUiState(
-			hasWriteAccess = hasWriteAccess(),
-			hasPaidLicense = hasPaidLicense(),
+			hasWriteAccess = paidLicense || trialState.isActive,
+			hasPaidLicense = paidLicense,
 			trialState = trialState,
 			trialExpirationText = expirationText
 		)

presentation/src/test/java/org/cryptomator/presentation/licensing/LicenseEnforcerTest.kt

@@ -403,7 +403,7 @@ class LicenseEnforcerTest {
 	}
 
 	@Test
-	fun `observeTrialExpiry idempotent once flag is set`() {
+	fun `evaluateTrialState is idempotent once sticky flag is set`() {
 		`when`(sharedPreferencesHandler.trialExpirationDate()).thenReturn(System.currentTimeMillis() - 1000L)
 		`when`(sharedPreferencesHandler.isTrialExpired()).thenReturn(true)