From 261321f1f7bbaedc30d228d9263836f0a37b4ede Mon Sep 17 00:00:00 2001
From: Gordon <88015331+GordonL0049@users.noreply.github.com>
Date: Tue, 8 Aug 2023 20:48:47 +0800
Subject: [PATCH 1/6] Update BluetoothConnectionBase.java

---
 .../appinventor/components/runtime/BluetoothConnectionBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinventor/components/src/com/google/appinventor/components/runtime/BluetoothConnectionBase.java b/appinventor/components/src/com/google/appinventor/components/runtime/BluetoothConnectionBase.java
index 9ef2f9b5e3c..cc84a65e8c1 100644
--- a/appinventor/components/src/com/google/appinventor/components/runtime/BluetoothConnectionBase.java
+++ b/appinventor/components/src/com/google/appinventor/components/runtime/BluetoothConnectionBase.java
@@ -194,7 +194,7 @@ public final void Disconnect() {
   }
 
   /**
-   * Returns `frue`{:.logic.block} if a connection to a Bluetooth device has been made.
+   * Returns `true`{:.logic.block} if a connection to a Bluetooth device has been made.
    */
   @SimpleProperty(category = PropertyCategory.BEHAVIOR,
       description = "On devices with API level 14 (LEVEL_ICE_CREAM_SANDWICH) or higher, " +

From 87d9bccdc641e0ccd77d1d0c20c3a98d61735ef3 Mon Sep 17 00:00:00 2001
From: Gordon <88015331+GordonL0049@users.noreply.github.com>
Date: Tue, 8 Aug 2023 20:50:25 +0800
Subject: [PATCH 2/6] Update connectivity.html

---
 appinventor/docs/html/reference/components/connectivity.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinventor/docs/html/reference/components/connectivity.html b/appinventor/docs/html/reference/components/connectivity.html
index 895499526e8..a64d71147d1 100644
--- a/appinventor/docs/html/reference/components/connectivity.html
+++ b/appinventor/docs/html/reference/components/connectivity.html
@@ -267,7 +267,7 @@ <h3 id="BluetoothClient-Properties">Properties</h3>
   <dd>Specifies whether numbers are sent and received with the most significant
  byte first.</dd>
   <dt id="BluetoothClient.IsConnected" class="boolean ro bo"><em>IsConnected</em></dt>
-  <dd>Returns <code class="logic block highlighter-rouge">frue</code> if a connection to a Bluetooth device has been made.</dd>
+  <dd>Returns <code class="logic block highlighter-rouge">true</code> if a connection to a Bluetooth device has been made.</dd>
   <dt id="BluetoothClient.NoLocationNeeded" class="boolean do"><em>NoLocationNeeded</em></dt>
   <dd>On Android 12 and later, indicates that Bluetooth is not used to determine the user’s location.</dd>
   <dt id="BluetoothClient.PollingRate" class="number"><em>PollingRate</em></dt>
@@ -386,7 +386,7 @@ <h3 id="BluetoothServer-Properties">Properties</h3>
   <dd>Returns true if this BluetoothServer component is accepting an
  incoming connection.</dd>
   <dt id="BluetoothServer.IsConnected" class="boolean ro bo"><em>IsConnected</em></dt>
-  <dd>Returns <code class="logic block highlighter-rouge">frue</code> if a connection to a Bluetooth device has been made.</dd>
+  <dd>Returns <code class="logic block highlighter-rouge">true</code> if a connection to a Bluetooth device has been made.</dd>
   <dt id="BluetoothServer.Secure" class="boolean"><em>Secure</em></dt>
   <dd>Specifies whether a secure connection should be used.</dd>
 </dl>

From d87f4d8be77c3ed11b0de7eedc180fcd2b8435e1 Mon Sep 17 00:00:00 2001
From: Gordon Lu <88015331+GordonL0049@users.noreply.github.com>
Date: Wed, 9 Aug 2023 07:40:08 +0800
Subject: [PATCH 3/6] Update connectivity.md

---
 .../docs/markdown/reference/components/connectivity.md        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinventor/docs/markdown/reference/components/connectivity.md b/appinventor/docs/markdown/reference/components/connectivity.md
index 6b95beaef0b..53c2a484014 100644
--- a/appinventor/docs/markdown/reference/components/connectivity.md
+++ b/appinventor/docs/markdown/reference/components/connectivity.md
@@ -154,7 +154,7 @@ Use `BluetoothClient` to connect your device to other devices using Bluetooth. T
  byte first.
 
 {:id="BluetoothClient.IsConnected" .boolean .ro .bo} *IsConnected*
-: Returns `frue`{:.logic.block} if a connection to a Bluetooth device has been made.
+: Returns `true`{:.logic.block} if a connection to a Bluetooth device has been made.
 
 {:id="BluetoothClient.NoLocationNeeded" .boolean .do} *NoLocationNeeded*
 : On Android 12 and later, indicates that Bluetooth is not used to determine the user's location.
@@ -297,7 +297,7 @@ Use the `BluetoothServer` component to turn your device into a server that recei
  incoming connection.
 
 {:id="BluetoothServer.IsConnected" .boolean .ro .bo} *IsConnected*
-: Returns `frue`{:.logic.block} if a connection to a Bluetooth device has been made.
+: Returns `true`{:.logic.block} if a connection to a Bluetooth device has been made.
 
 {:id="BluetoothServer.Secure" .boolean} *Secure*
 : Specifies whether a secure connection should be used.

From efbde363b893e33c968d7c07948fee861e415892 Mon Sep 17 00:00:00 2001
From: Gordon Lu <88015331+GordonL0049@users.noreply.github.com>
Date: Wed, 9 Aug 2023 08:47:25 +0800
Subject: [PATCH 4/6] Update MockForm.java

---
 .../client/editor/simple/components/MockForm.java          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
index 1a1385c9ec4..c43a0a37c01 100644
--- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
+++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
@@ -931,10 +931,9 @@ private void setBlockSubsetProperty(String asJson) {
       editor.getProjectEditor().changeProjectSettingsProperty(
           SettingsConstants.PROJECT_YOUNG_ANDROID_SETTINGS,
           SettingsConstants.YOUNG_ANDROID_SETTINGS_BLOCK_SUBSET, asJson);
-    }
-    
-    if (editor.isLoadComplete()) {
-      ((YaFormEditor)editor).reloadComponentPalette(asJson);
+      if (editor.isLoadComplete()) {
+        ((YaFormEditor)editor).reloadComponentPalette(asJson);
+      }
     }
   }
 

From 9bd6080e46ef3b6530a51a49c069834d0f949670 Mon Sep 17 00:00:00 2001
From: Gordon Lu <88015331+GordonL0049@users.noreply.github.com>
Date: Thu, 10 Aug 2023 16:01:03 +0800
Subject: [PATCH 5/6] Update MockForm.java

---
 .../client/editor/simple/components/MockForm.java          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
index c43a0a37c01..91e61c77864 100644
--- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
+++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
@@ -931,9 +931,10 @@ private void setBlockSubsetProperty(String asJson) {
       editor.getProjectEditor().changeProjectSettingsProperty(
           SettingsConstants.PROJECT_YOUNG_ANDROID_SETTINGS,
           SettingsConstants.YOUNG_ANDROID_SETTINGS_BLOCK_SUBSET, asJson);
-      if (editor.isLoadComplete()) {
-        ((YaFormEditor)editor).reloadComponentPalette(asJson);
-      }
+    }
+
+    if (editor.isLoadComplete()) {
+      ((YaFormEditor)editor).reloadComponentPalette(asJson);
     }
   }
 

From 4dc1a1f378f2793f762c6d450e29ba051ec27e2b Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@mit.edu>
Date: Fri, 11 Aug 2023 08:33:35 -0400
Subject: [PATCH 6/6] Revert changes to MockForm

Change-Id: Ie19fe8b3a561a3bb0b25efb965a2ae5f51c60eec
---
 .../appinventor/client/editor/simple/components/MockForm.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
index 91e61c77864..1a1385c9ec4 100644
--- a/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
+++ b/appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockForm.java
@@ -932,7 +932,7 @@ private void setBlockSubsetProperty(String asJson) {
           SettingsConstants.PROJECT_YOUNG_ANDROID_SETTINGS,
           SettingsConstants.YOUNG_ANDROID_SETTINGS_BLOCK_SUBSET, asJson);
     }
-
+    
     if (editor.isLoadComplete()) {
       ((YaFormEditor)editor).reloadComponentPalette(asJson);
     }