Drop blocked-writes toast and preserve locked-action header on freemium

Author: tobihagemann

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

@@ -21,41 +21,16 @@ import javax.inject.Inject
 class LicenseEnforcer @Inject constructor(private val sharedPreferencesHandler: SharedPreferencesHandler) {
 
 	enum class LockedAction(
-		@StringRes val toastMessageRes: Int,
 		@StringRes val headerMessageRes: Int
 	) {
-		CREATE_VAULT(
-			R.string.read_only_reason_create_vault,
-			R.string.screen_license_check_locked_create_vault,
-		),
-		UPLOAD_FILES(
-			R.string.read_only_reason_add_file,
-			R.string.screen_license_check_locked_upload_files,
-		),
-		CREATE_FOLDER(
-			R.string.read_only_reason_create_folder,
-			R.string.screen_license_check_locked_create_folder,
-		),
-		CREATE_TEXT_FILE(
-			R.string.read_only_reason_create_text_file,
-			R.string.screen_license_check_locked_create_text_file,
-		),
-		SHARE_NODE(
-			R.string.read_only_reason_share_node,
-			R.string.screen_license_check_locked_share_node,
-		),
-		RENAME_NODE(
-			R.string.read_only_reason_rename_node,
-			R.string.screen_license_check_locked_rename_node,
-		),
-		MOVE_NODE(
-			R.string.read_only_reason_move_node,
-			R.string.screen_license_check_locked_move_node,
-		),
-		DELETE_NODE(
-			R.string.read_only_reason_delete_node,
-			R.string.screen_license_check_locked_delete_node,
-		);
+		CREATE_VAULT(R.string.screen_license_check_locked_create_vault),
+		UPLOAD_FILES(R.string.screen_license_check_locked_upload_files),
+		CREATE_FOLDER(R.string.screen_license_check_locked_create_folder),
+		CREATE_TEXT_FILE(R.string.screen_license_check_locked_create_text_file),
+		SHARE_NODE(R.string.screen_license_check_locked_share_node),
+		RENAME_NODE(R.string.screen_license_check_locked_rename_node),
+		MOVE_NODE(R.string.screen_license_check_locked_move_node),
+		DELETE_NODE(R.string.screen_license_check_locked_delete_node);
 
 		companion object {
 			fun fromName(name: String?): LockedAction? {
@@ -138,16 +113,11 @@ class LicenseEnforcer @Inject constructor(private val sharedPreferencesHandler:
 		)
 	}
 
-	@StringRes
-	fun defaultReasonRes(): Int = R.string.read_only_banner
-
 	fun ensureWriteAccess(activity: Activity, action: LockedAction): Boolean {
 		if (hasWriteAccess()) {
 			return true
 		}
 
-		Toast.makeText(activity, activity.getString(action.toastMessageRes), Toast.LENGTH_LONG).show()
-
 		if (FlavorConfig.isPremiumFlavor) {
 			return false
 		}

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

@@ -55,7 +55,7 @@ class LicenseCheckActivity : BaseActivity<ActivityLicenseCheckBinding>(ActivityL
 					licenseContentViewBinder.bindPurchaseState(hasWriteAccess, hasPaidLicense)
 				}
 				override fun onTrialStateChanged(active: Boolean, expired: Boolean, expirationText: String?) {
-					licenseContentViewBinder.bindTrialState(active, expired, expirationText)
+					licenseContentViewBinder.bindTrialState(active, expired, expirationText, hasLockedActionHeader = lockedAction != null)
 				}
 			},
 			priceLoader = { licenseContentViewBinder.loadAndBindPrices(application as CryptomatorApp) }

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

@@ -137,7 +137,7 @@ class LicenseContentViewBinder(
 	}
 
 	/** Updates trial-related view visibility based on trial state. */
-	fun bindTrialState(active: Boolean, expired: Boolean, expirationText: String?) {
+	fun bindTrialState(active: Boolean, expired: Boolean, expirationText: String?, hasLockedActionHeader: Boolean = false) {
 		if (active || expired) {
 			binding.trialButtonGroup.visibility = View.GONE
 			binding.tvTrialStatusBadge.visibility = View.VISIBLE
@@ -147,10 +147,10 @@ class LicenseContentViewBinder(
 			)
 			binding.tvTrialExpiration.visibility = View.VISIBLE
 			binding.tvTrialExpiration.text = expirationText
-			if (expired) {
+			if (expired && !hasLockedActionHeader) {
 				binding.tvInfoText.visibility = View.VISIBLE
 				binding.tvInfoText.text = context.getString(R.string.screen_license_check_trial_expired_info)
-			} else {
+			} else if (!hasLockedActionHeader) {
 				binding.tvInfoText.visibility = View.GONE
 			}
 		} else {

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

@@ -55,15 +55,6 @@
 	<string name="error_hub_not_trustworthy">Hub is not trustworthy.</string>
 
 	<!-- # read-only & purchases -->
-	<string name="read_only_banner">You are currently in read-only mode.</string>
-	<string name="read_only_reason_create_vault">Creating new vaults requires an active license.</string>
-	<string name="read_only_reason_add_file">Uploading files requires write access.</string>
-	<string name="read_only_reason_create_folder">Folder creation is only available with a license.</string>
-	<string name="read_only_reason_create_text_file">Creating files requires an active license.</string>
-	<string name="read_only_reason_share_node">Sharing files or folders is only available with write access.</string>
-	<string name="read_only_reason_rename_node">Renaming requires write access.</string>
-	<string name="read_only_reason_move_node">Moving files or folders requires write access.</string>
-	<string name="read_only_reason_delete_node">Deleting files or folders requires write access.</string>
 	<string name="read_only_reason_hub_inactive">Upgrade your Hub license to enable writing for this vault.</string>
 	<string name="toast_purchase_revoked_refunded">Your lifetime purchase was refunded. You now have read-only access.</string>
 	<string name="toast_purchase_revoked_subscription_inactive">Your subscription is no longer active. You now have read-only access.</string>