Update TrialManager.kt

Android-PowerUser · web-flow · commit b7dff2c002cd · 2025-05-11T13:08:06.000+02:00
diff --git a/app/src/main/kotlin/com/google/ai/sample/TrialManager.kt b/app/src/main/kotlin/com/google/ai/sample/TrialManager.kt
@@ -10,10 +10,9 @@ object TrialManager {
     const val TRIAL_DURATION_MS = 30 * 60 * 1000L // 30 minutes in milliseconds
 
     // SharedPreferences keys for flags. The actual timestamp is managed via Keystore aliases.
-    // private const val KEY_TRIAL_END_TIME_UNENCRYPTED = "trialUtcEndTimeUnencrypted" // REMOVED
     private const val KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME = "trialAwaitingFirstInternetTime"
     private const val KEY_PURCHASED_FLAG = "appPurchased"
-    private const val KEY_TRIAL_CONFIRMED_EXPIRED = "trialConfirmedExpired" 
+    // private const val KEY_TRIAL_CONFIRMED_EXPIRED = "trialConfirmedExpired" // REMOVED
 
     private const val TAG = "TrialManager"
 
@@ -29,18 +28,14 @@ object TrialManager {
         return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
     }
 
-    // Stores the trial end time by creating a Keystore alias.
     private fun recordTrialEndTimeInKeystore(context: Context, utcEndTimeMs: Long) {
         Log.d(TAG, "recordTrialEndTimeInKeystore called with utcEndTimeMs: $utcEndTimeMs")
-        KeystoreHelper.storeTimestampAlias(context, utcEndTimeMs) // Context is needed for KeystoreHelper
+        KeystoreHelper.storeTimestampAlias(context, utcEndTimeMs)
         Log.d(TAG, "Requested storage of trial end time alias for $utcEndTimeMs in Keystore.")
     }
 
-    // Retrieves the trial end time by parsing a Keystore alias.
     private fun getTrialEndTimeFromKeystore(context: Context): Long? {
         Log.d(TAG, "getTrialEndTimeFromKeystore called")
-        // Context is not strictly needed by KeystoreHelper.getStoredTimestampFromAlias current impl,
-        // but passed for consistency or future KeystoreHelper changes.
         val endTime = KeystoreHelper.getStoredTimestampFromAlias()
         if (endTime == null) {
             Log.d(TAG, "No trial end time alias found in Keystore.")
@@ -65,24 +60,20 @@ object TrialManager {
         if (existingEndTimeInKeystore == null && isAwaitingFirstInternet) {
             val utcEndTimeMs = currentUtcTimeMs + TRIAL_DURATION_MS
             Log.d(TAG, "Conditions met to start trial. Calculated utcEndTimeMs: $utcEndTimeMs")
-            recordTrialEndTimeInKeystore(context, utcEndTimeMs) // Store in Keystore
+            recordTrialEndTimeInKeystore(context, utcEndTimeMs)
             
-            // After successfully requesting to store in Keystore, update SharedPreferences
             Log.d(TAG, "Setting KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME to false.")
             prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false).apply()
             Log.i(TAG, "Trial started with internet time (Keystore alias). Ends at UTC: $utcEndTimeMs. Awaiting flag set to false.")
         } else {
             if (existingEndTimeInKeystore != null) {
                 Log.d(TAG, "Trial not started: End time already exists in Keystore ($existingEndTimeInKeystore).")
-                // If Keystore has data, ensure 'isAwaitingFirstInternet' is false for consistency.
                 if (isAwaitingFirstInternet) {
                      Log.w(TAG, "Inconsistency: Trial end time found in Keystore, but KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME is true. Setting to false.")
                      prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false).apply()
                 }
-            } else { // existingEndTimeInKeystore is null but isAwaitingFirstInternet is false
-                 Log.d(TAG, "Trial not started: Not awaiting first internet, but no Keystore alias found. This might mean Keystore was cleared or failed to save previously.")
-                 // This state implies something went wrong. It might be best to revert to awaiting state
-                 // if we expect a trial to be possible. For now, just logging.
+            } else { 
+                 Log.d(TAG, "Trial not started: Not awaiting first internet (flag is false), but no Keystore alias found. This might mean Keystore was cleared or failed to save previously.")
             }
         }
     }
@@ -97,23 +88,28 @@ object TrialManager {
         }
 
         val isAwaitingFirstInternetTime = prefs.getBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, true)
-        val trialUtcEndTime = getTrialEndTimeFromKeystore(context) // Retrieve from Keystore
-        val confirmedExpired = prefs.getBoolean(KEY_TRIAL_CONFIRMED_EXPIRED, false)
-        Log.d(TAG, "getTrialState: isAwaitingFirstInternetTime: $isAwaitingFirstInternetTime, trialUtcEndTime (from Keystore): $trialUtcEndTime, confirmedExpired: $confirmedExpired")
+        val trialUtcEndTime = getTrialEndTimeFromKeystore(context)
+        // val confirmedExpired = prefs.getBoolean(KEY_TRIAL_CONFIRMED_EXPIRED, false) // REMOVED
+        Log.d(TAG, "getTrialState: isAwaitingFirstInternetTime: $isAwaitingFirstInternetTime, trialUtcEndTime (from Keystore): $trialUtcEndTime")
 
-        if (confirmedExpired) {
-            Log.d(TAG, "getTrialState: Trial previously confirmed expired (flag was true). Returning EXPIRED_INTERNET_TIME_CONFIRMED.")
-            return TrialState.EXPIRED_INTERNET_TIME_CONFIRMED
-        }
+        // if (confirmedExpired) { // REMOVED
+        //     Log.d(TAG, "getTrialState: Trial previously confirmed expired (flag was true). Returning EXPIRED_INTERNET_TIME_CONFIRMED.")
+        //     return TrialState.EXPIRED_INTERNET_TIME_CONFIRMED
+        // }
 
         if (currentUtcTimeMs == null) {
             Log.d(TAG, "getTrialState: currentUtcTimeMs is null.")
+            // If we have an end time from Keystore, but no current time, we can't confirm expiry.
+            // However, if that end time *could* be in the past, this is ambiguous.
+            // The primary role here is to determine if we're awaiting or if we need internet.
             return if (trialUtcEndTime == null && isAwaitingFirstInternetTime) {
-                Log.d(TAG, "getTrialState: Returning NOT_YET_STARTED_AWAITING_INTERNET (no Keystore alias, awaiting internet, not confirmed expired)")
+                Log.d(TAG, "getTrialState: Returning NOT_YET_STARTED_AWAITING_INTERNET (no Keystore alias, awaiting internet)")
                 TrialState.NOT_YET_STARTED_AWAITING_INTERNET
             } else {
-                // If trialUtcEndTime exists OR not awaiting, but no current time to verify.
-                Log.d(TAG, "getTrialState: Returning INTERNET_UNAVAILABLE_CANNOT_VERIFY (Keystore alias might exist or not awaiting, but no current time, not confirmed expired)")
+                // This means either trial has started (endTime exists in Keystore) or it's not awaiting first internet,
+                // but we don't have current time to check. Or, endTime is null but we are not awaiting (inconsistent state).
+                // Or, Keystore has an end time which *might* be expired, but we can't be sure without current time.
+                Log.d(TAG, "getTrialState: Returning INTERNET_UNAVAILABLE_CANNOT_VERIFY (Keystore alias might exist or not awaiting, but no current time)")
                 TrialState.INTERNET_UNAVAILABLE_CANNOT_VERIFY
             }
         }
@@ -126,29 +122,25 @@ object TrialManager {
                 TrialState.NOT_YET_STARTED_AWAITING_INTERNET
             }
             trialUtcEndTime == null && !isAwaitingFirstInternetTime -> {
-                // This implies prefs say trial started (not awaiting), but Keystore has no record.
-                // This could happen if Keystore entry was cleared or failed to save.
                 Log.e(TAG, "INCONSISTENCY: Trial marked as started (not awaiting internet in prefs), but no trial end time alias found in Keystore. Resetting to await internet.")
                 prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, true).apply()
-                TrialState.NOT_YET_STARTED_AWAITING_INTERNET // Treat as if trial never properly started or Keystore was wiped.
+                TrialState.NOT_YET_STARTED_AWAITING_INTERNET 
             }
-            trialUtcEndTime != null -> { // Keystore has a trial end time
-                // Ensure 'isAwaitingFirstInternetTime' is false if we have Keystore data.
+            trialUtcEndTime != null -> { 
                 if(isAwaitingFirstInternetTime) {
                     Log.w(TAG, "Inconsistency: Active trial (Keystore data exists), but KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME is true. Setting to false.")
                     prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false).apply()
                 }
                 if (currentUtcTimeMs < trialUtcEndTime) {
                     Log.d(TAG, "getTrialState: Case B: trialUtcEndTime (Keystore: $trialUtcEndTime) > currentUtcTimeMs ($currentUtcTimeMs). Returning ACTIVE_INTERNET_TIME_CONFIRMED")
                     TrialState.ACTIVE_INTERNET_TIME_CONFIRMED
-                } else { // currentUtcTimeMs >= trialUtcEndTime
-                    Log.i(TAG, "getTrialState: Case C: trialUtcEndTime (Keystore: $trialUtcEndTime) <= currentUtcTimeMs ($currentUtcTimeMs). Trial EXPIRED. Setting KEY_TRIAL_CONFIRMED_EXPIRED=true.")
-                    prefs.edit().putBoolean(KEY_TRIAL_CONFIRMED_EXPIRED, true).apply()
+                } else { 
+                    Log.i(TAG, "getTrialState: Case C: trialUtcEndTime (Keystore: $trialUtcEndTime) <= currentUtcTimeMs ($currentUtcTimeMs). Trial EXPIRED.")
+                    // No longer setting KEY_TRIAL_CONFIRMED_EXPIRED flag here. Expiry is purely based on time comparison.
                     TrialState.EXPIRED_INTERNET_TIME_CONFIRMED
                 }
             }
             else -> {
-                // Should not be reached if logic above is exhaustive.
                 Log.e(TAG, "Unhandled case in getTrialState. isAwaiting: $isAwaitingFirstInternetTime, endTimeFromKeystore: $trialUtcEndTime, currentTime: $currentUtcTimeMs. Defaulting to NOT_YET_STARTED_AWAITING_INTERNET.")
                 TrialState.NOT_YET_STARTED_AWAITING_INTERNET
             }
@@ -160,11 +152,11 @@ object TrialManager {
         val editor = getSharedPreferences(context).edit()
         
         Log.d(TAG, "Deleting trial timestamp alias(es) from Keystore.")
-        KeystoreHelper.deleteAllTimestampAliases() // Delete Keystore entry/entries
+        KeystoreHelper.deleteAllTimestampAliases() 
 
-        Log.d(TAG, "Removing SharedPreferences keys: KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, KEY_TRIAL_CONFIRMED_EXPIRED")
+        Log.d(TAG, "Removing SharedPreferences keys: KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME") // KEY_TRIAL_CONFIRMED_EXPIRED removed from this list
         editor.remove(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME)
-        editor.remove(KEY_TRIAL_CONFIRMED_EXPIRED) 
+        // editor.remove(KEY_TRIAL_CONFIRMED_EXPIRED) // REMOVED
         
         Log.d(TAG, "Setting KEY_PURCHASED_FLAG to true")
         editor.putBoolean(KEY_PURCHASED_FLAG, true)
@@ -183,9 +175,7 @@ object TrialManager {
         
         if (isPurchased(context)) {
             Log.d(TAG, "App is purchased. No trial initialization needed.")
-            // Ensure no lingering trial aliases if purchased
             KeystoreHelper.deleteAllTimestampAliases()
-            // Ensure awaiting flag is false if purchased
             if (prefs.contains(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME)) {
                 prefs.edit().remove(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME).apply()
             }
@@ -198,14 +188,10 @@ object TrialManager {
         Log.d(TAG, "Checking for existing flags/state: awaitingFlagExists=$awaitingFlagExists, trialEndTimeInKeystore=$trialEndTimeInKeystore")
 
         if (trialEndTimeInKeystore == null) {
-            // No trial started in Keystore.
             if (!awaitingFlagExists) {
-                // And no awaiting flag in prefs, means fresh install or data cleared.
                 Log.d(TAG, "No Keystore trial data and no awaiting flag. Initializing KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME to true.")
                 prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, true).apply()
             } else {
-                // Awaiting flag exists. If it's false, this is an inconsistent state (not awaiting but no Keystore data).
-                // Revert to awaiting true for safety.
                 val isAwaiting = prefs.getBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, true)
                 if (!isAwaiting) {
                     Log.w(TAG, "Inconsistency: No Keystore trial data, but KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME is false. Resetting to true.")
@@ -215,9 +201,8 @@ object TrialManager {
                 }
             }
         } else {
-            // Trial has started (Keystore has data). Ensure awaiting flag is false.
             Log.d(TAG, "Keystore has trial data (ends at $trialEndTimeInKeystore). Ensuring KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME is false.")
-            if (!awaitingFlagExists || prefs.getBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false)) {
+            if (!awaitingFlagExists || prefs.getBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false)) { // If flag exists and is true, or doesn't exist
                 prefs.edit().putBoolean(KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME, false).apply()
                 Log.d(TAG, "Set KEY_TRIAL_AWAITING_FIRST_INTERNET_TIME to false as Keystore has trial data.")
             }
