From 70344fd40f3c13ea49053e83b76833fb6d5b0e66 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Mon, 7 Nov 2022 11:50:05 -0500
Subject: [PATCH 1/3] Disable spatial audio for the maximized speaker

---
 src/video-grid/VideoTileContainer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/video-grid/VideoTileContainer.tsx b/src/video-grid/VideoTileContainer.tsx
index cb93dbdd..28fa0472 100644
--- a/src/video-grid/VideoTileContainer.tsx
+++ b/src/video-grid/VideoTileContainer.tsx
@@ -71,7 +71,7 @@ export function VideoTileContainer({
     stream ?? null,
     audioContext,
     audioDestination,
-    isLocal,
+    isLocal || maximised,
     localVolume
   );
   const {

From 01244c1873462a05f28386fd78c54a90f5675d7d Mon Sep 17 00:00:00 2001
From: Timo <16718859+toger5@users.noreply.github.com>
Date: Mon, 7 Nov 2022 18:00:35 +0100
Subject: [PATCH 2/3] Posthog load settings on startup (#734)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Timo K <timok@element.io>
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/PosthogAnalytics.ts    | 11 +++++++----
 src/settings/useSetting.ts |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/PosthogAnalytics.ts b/src/PosthogAnalytics.ts
index 4da55e39..b3f03c72 100644
--- a/src/PosthogAnalytics.ts
+++ b/src/PosthogAnalytics.ts
@@ -18,7 +18,7 @@ import posthog, { CaptureOptions, PostHog, Properties } from "posthog-js";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { widget } from "./widget";
-import { settingsBus } from "./settings/useSetting";
+import { getSetting, settingsBus } from "./settings/useSetting";
 import {
   CallEndedTracker,
   CallStartedTracker,
@@ -97,7 +97,7 @@ export class PosthogAnalytics {
   private static internalInstance = null;
 
   private readonly enabled: boolean = false;
-  private anonymity = Anonymity.Pseudonymous;
+  private anonymity = Anonymity.Disabled;
   private platformSuperProperties = {};
   private registrationType: RegistrationType = RegistrationType.Guest;
 
@@ -132,6 +132,8 @@ export class PosthogAnalytics {
     } else {
       this.enabled = false;
     }
+    const optInAnalytics = getSetting("opt-in-analytics", false);
+    this.updateAnonymityFromSettingsAndIdentifyUser(optInAnalytics);
     this.startListeningToSettingsChanges();
   }
 
@@ -270,10 +272,11 @@ export class PosthogAnalytics {
   }
 
   private userRegisteredInThisSession(): boolean {
+    // only if the signup end got tracked the end time is set. Otherwise its default value is Date(0).
     return this.eventSignup.getSignupEndTime() > new Date(0);
   }
 
-  public async updateAnonymityFromSettings(
+  public async updateAnonymityFromSettingsAndIdentifyUser(
     pseudonymousOptIn: boolean
   ): Promise<void> {
     // Update this.anonymity based on the user's analytics opt-in settings
@@ -315,7 +318,7 @@ export class PosthogAnalytics {
     // Note that for new accounts, pseudonymousAnalyticsOptIn won't be set, so updateAnonymityFromSettings
     // won't be called (i.e. this.anonymity will be left as the default, until the setting changes)
     settingsBus.on("opt-in-analytics", (optInAnalytics) => {
-      this.updateAnonymityFromSettings(optInAnalytics);
+      this.updateAnonymityFromSettingsAndIdentifyUser(optInAnalytics);
     });
   }
 
diff --git a/src/settings/useSetting.ts b/src/settings/useSetting.ts
index 952f2871..b6de9a21 100644
--- a/src/settings/useSetting.ts
+++ b/src/settings/useSetting.ts
@@ -51,6 +51,12 @@ const useSetting = <T>(
     ),
   ];
 };
+export const getSetting = <T>(name: string, defaultValue: T): T => {
+  const key = `matrix-setting-${name}`;
+
+  const item = localStorage.getItem(key);
+  return item === null ? defaultValue : JSON.parse(item);
+};
 
 export const useSpatialAudio = () => useSetting("spatial-audio", false);
 export const useShowInspector = () => useSetting("show-inspector", false);

From e1336254051feb99f3f12306186af2be4d7965aa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 7 Nov 2022 17:37:40 +0000
Subject: [PATCH 3/3] Don't check out group-call branch in build script

This build script might change more soon (we shouldn't really need
to checkout & link the js-sdk at all) but for now let's just switch
the branch now group-call is merged.
---
 scripts/dockerbuild.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/dockerbuild.sh b/scripts/dockerbuild.sh
index 7dce8f6a..cda60c21 100755
--- a/scripts/dockerbuild.sh
+++ b/scripts/dockerbuild.sh
@@ -7,7 +7,6 @@ export VITE_PRODUCT_NAME="Element Call"
 
 git clone https://github.com/matrix-org/matrix-js-sdk.git
 cd matrix-js-sdk
-git checkout robertlong/group-call
 yarn install
 yarn run build
 yarn link