[expo-updates][android] restrict property visibility on state machine…

… objects (expo#23063)
crummy · Jun 26, 2023 · 2c04f0a · 2c04f0a
1 parent 3fa54f5
commit 2c04f0a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/packages/expo-updates/CHANGELOG.md b/packages/expo-updates/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [iOS] Use weak delegate for state machine. ([#23060](https://github.com/expo/expo/pull/23060) by [@wschurman](https://github.com/wschurman))
 - [Android] Convert LoaderTask.RemoteCheckResult to sealed class. ([#23061](https://github.com/expo/expo/pull/23061) by [@wschurman](https://github.com/wschurman))
+- [Android] Restrict property visibility on state machine objects. ([#23063](https://github.com/expo/expo/pull/23063) by [@wschurman](https://github.com/wschurman))
 
 ### 💡 Others
 

diff --git a/...po-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateContext.kt b/...po-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateContext.kt
@@ -8,16 +8,16 @@ import org.json.JSONObject
 The state machine context, with information intended to be consumed by application JS code.
  */
 data class UpdatesStateContext(
-  val isUpdateAvailable: Boolean = false,
-  val isUpdatePending: Boolean = false,
-  val isRollback: Boolean = false,
-  val isChecking: Boolean = false,
-  val isDownloading: Boolean = false,
-  val isRestarting: Boolean = false,
-  val latestManifest: JSONObject? = null,
-  val downloadedManifest: JSONObject? = null,
-  val checkError: UpdatesStateError? = null,
-  val downloadError: UpdatesStateError? = null
+  private val isUpdateAvailable: Boolean = false,
+  private val isUpdatePending: Boolean = false,
+  private val isRollback: Boolean = false,
+  private val isChecking: Boolean = false,
+  private val isDownloading: Boolean = false,
+  private val isRestarting: Boolean = false,
+  private val latestManifest: JSONObject? = null,
+  private val downloadedManifest: JSONObject? = null,
+  private val checkError: UpdatesStateError? = null,
+  private val downloadError: UpdatesStateError? = null
 ) {
 
   val json: Map<String, Any>

diff --git a/...expo-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateError.kt b/...expo-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateError.kt
@@ -5,7 +5,7 @@ package expo.modules.updates.statemachine
  * For now, we just have the "message" property.
  */
 data class UpdatesStateError(
-  val message: String
+  private val message: String
 ) {
   val json: Map<String, String>
     get() {

diff --git a/...po-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateMachine.kt b/...po-updates/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateMachine.kt
@@ -18,11 +18,13 @@ class UpdatesStateMachine(
    * The current state
    */
   var state: UpdatesStateValue = UpdatesStateValue.Idle
+    private set
 
   /**
    * The context
    */
   var context: UpdatesStateContext = UpdatesStateContext()
+    private set
 
   /**
    Called after the app restarts (reloadAsync()) to reset the machine to its