Ellipsise app bar text on mobile

We already had text-overflow: ellipsis set on the title and subtitle elements of the app bar, but due to an annoying quirk of place-items: center, this had no effect. place-items: center stretch seems to give the text elements the right size constraints.

sdk/pnpm-lock.yaml

@@ -1,9 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: false
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .: {}

sdk/src/RTCParticipation.test.ts

@@ -12,7 +12,6 @@ import {
   MatrixRTCSessionEvent,
   MembershipManagerEvent,
   type Transport,
-  type UnstableLivekitTransport,
 } from "matrix-js-sdk/lib/matrixrtc";
 import { BehaviorSubject, EMPTY, Subject } from "rxjs";
 import { describe, expect, it, type Mock, vi } from "vitest";
@@ -47,16 +46,10 @@ import {
   MockRTCSession,
 } from "./utils/test";
 
-const transport: UnstableLivekitTransport = {
+const transport: Transport = {
   type: "livekit",
   livekit_service_url: "https://lk.example.org",
 };
-
-const transportWithAlias: Transport = {
-  livekit_alias: "!room:example.org",
-  ...transport,
-};
-
 const userId = "@alice:example.org";
 /** A token with the publish grant, as a homeserver issues it for its own SFU. */
 const publisherJWT = [
@@ -230,7 +223,7 @@ describe("createRTCParticipation", () => {
     await flushPromises();
     expect(join).toHaveBeenCalledWith(
       { userId, deviceId, memberId: legacyMemberId },
-      [transportWithAlias],
+      [transport],
       expect.objectContaining({
         manageMediaKeys: true,
         unstableSendStickyEvents: false,
@@ -326,7 +319,7 @@ describe("createRTCParticipation", () => {
     await flushPromises();
     expect(join).toHaveBeenCalledWith(
       expect.anything(),
-      [transportWithAlias],
+      [transport],
       expect.objectContaining({ delayedLeaveEventDelayMs: 7_200_000 }),
     );
     expect(fake.delegateDelayedLeave).not.toHaveBeenCalled();

sdk/src/RTCParticipation.ts

@@ -174,20 +174,14 @@ export function createRTCParticipation(
       timings.syncDisconnectGracePeriodMs,
     ),
     joinMatrixRTC: (transport, delayedLeave) =>
-      joinJsSdkSession(
-        room.roomId,
-        jsSdkSession,
-        ownMembershipIdentity,
-        transport,
-        {
-          encryptMedia: encryptionSystem.kind !== E2eeType.NONE,
-          matrixRTCMode,
-          sendNotificationType: options.sendNotificationType,
-          applicationData: options.applicationData,
-          timings,
-          delayedLeave,
-        },
-      ),
+      joinJsSdkSession(jsSdkSession, ownMembershipIdentity, transport, {
+        encryptMedia: encryptionSystem.kind !== E2eeType.NONE,
+        matrixRTCMode,
+        sendNotificationType: options.sendNotificationType,
+        applicationData: options.applicationData,
+        timings,
+        delayedLeave,
+      }),
     membershipManagerError$: fromEvent(
       jsSdkSession,
       MatrixRTCSessionEvent.MembershipManagerError,

sdk/src/matrixrtc/joinJsSdkSession.test.ts

@@ -6,7 +6,6 @@ Please see LICENSE in the repository root for full details.
 */
 
 import {
-  type UnstableLivekitTransport,
   type MatrixRTCSession,
   type Transport,
 } from "matrix-js-sdk/lib/matrixrtc";
@@ -16,16 +15,11 @@ import { defaultSessionTimings, MatrixRTCMode } from "../config";
 import { ownMemberMock } from "../utils/test";
 import { joinJsSdkSession } from "./joinJsSdkSession";
 
-const transport: UnstableLivekitTransport = {
+const transport: Transport = {
   type: "livekit",
   livekit_service_url: "https://lk.example.org",
 };
 
-const transportWithAlias: Transport = {
-  livekit_alias: "!room:example.org",
-  ...transport,
-};
-
 /** A session that only records the join; nothing else of it is touched. */
 function session(): MatrixRTCSession & {
   join: Mock<MatrixRTCSession["join"]>;
@@ -45,7 +39,7 @@ describe("joinJsSdkSession", () => {
       keyRotationParticipantLimit: 20,
     };
 
-    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
+    joinJsSdkSession(s, ownMemberMock, transport, {
       encryptMedia: true,
       matrixRTCMode: MatrixRTCMode.Compatibility,
       sendNotificationType: "ring",
@@ -57,7 +51,7 @@ describe("joinJsSdkSession", () => {
       },
     });
 
-    expect(s.join).toHaveBeenCalledWith(ownMemberMock, [transportWithAlias], {
+    expect(s.join).toHaveBeenCalledWith(ownMemberMock, [transport], {
       notificationType: "ring",
       callIntent: undefined,
       applicationData: {},
@@ -78,7 +72,7 @@ describe("joinJsSdkSession", () => {
   it("gives up on the network once the delayed leave has probably been sent", () => {
     const s = session();
 
-    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
+    joinJsSdkSession(s, ownMemberMock, transport, {
       encryptMedia: false,
       matrixRTCMode: MatrixRTCMode.Compatibility,
       timings: { ...defaultSessionTimings, networkErrorRetryMs: 4_000 },
@@ -87,7 +81,7 @@ describe("joinJsSdkSession", () => {
 
     expect(s.join).toHaveBeenCalledWith(
       ownMemberMock,
-      [transportWithAlias],
+      [transport],
       expect.objectContaining({
         manageMediaKeys: false,
         maximumNetworkErrorRetryCount: 4,
@@ -98,30 +92,7 @@ describe("joinJsSdkSession", () => {
   it("lifts the call intent out of the application data and sends sticky events in Matrix 2.0 mode", () => {
     const s = session();
 
-    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
-      encryptMedia: true,
-      matrixRTCMode: MatrixRTCMode.Matrix_2_0,
-      applicationData: { "m.call.intent": "audio", custom: 1 },
-      timings: defaultSessionTimings,
-      delayedLeave: defaultSessionTimings.delayedLeave,
-    });
-
-    expect(s.join).toHaveBeenCalledWith(
-      ownMemberMock,
-      [transportWithAlias],
-      expect.objectContaining({
-        callIntent: "audio",
-        applicationData: { custom: 1 },
-        unstableSendStickyEvents: true,
-      }),
-    );
-  });
-
-  it("does not add livekit_alias to newer transport format", () => {
-    const s = session();
-    const transport = { type: "livekit", url: "wss://lk.example.org" };
-
-    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
+    joinJsSdkSession(s, ownMemberMock, transport, {
       encryptMedia: true,
       matrixRTCMode: MatrixRTCMode.Matrix_2_0,
       applicationData: { "m.call.intent": "audio", custom: 1 },

sdk/src/matrixrtc/joinJsSdkSession.ts

@@ -35,7 +35,6 @@ interface Options {
  * @throws If the join could not be started.
  */
 export function joinJsSdkSession(
-  roomId: string,
   session: JsSdkRTCSession,
   ownMembershipIdentity: CallMembershipIdentityParts,
   transport: Transport,
@@ -59,37 +58,20 @@ export function joinJsSdkSession(
     timings.syncDisconnectGracePeriodMs,
     delayedLeave.delay_ms,
   );
-
-  session.join(
-    ownMembershipIdentity,
-    // TODO: `livekit_alias` should be unused these days, but some Ruma-based
-    // clients still expect it to be present. Remove from `publishedTransports`
-    // as soon as https://github.com/ruma/ruma/pull/2642 and
-    // https://github.com/matrix-org/matrix-rust-sdk/pull/7335 are widely
-    // deployed.
-    [
-      {
-        ...("livekit_service_url" in transport
-          ? { livekit_alias: roomId }
-          : {}),
-        ...transport,
-      },
-    ],
-    {
-      notificationType: sendNotificationType,
-      callIntent,
-      applicationData: rest,
-      manageMediaKeys: encryptMedia,
-      delayedLeaveEventRestartMs: delayedLeave.restart_ms,
-      delayedLeaveEventDelayMs: delayedLeave.delay_ms,
-      delayedLeaveEventRestartLocalTimeoutMs: delayedLeave.restart_timeout_ms,
-      networkErrorRetryMs: timings.networkErrorRetryMs,
-      makeKeyDelay: timings.waitForKeyRotationMs,
-      membershipEventExpiryMs: timings.membershipEventExpiryMs,
-      keyRotationParticipantLimit: timings.keyRotationParticipantLimit,
-      unstableSendStickyEvents: matrixRTCMode === MatrixRTCMode.Matrix_2_0,
-      maximumNetworkErrorRetryCount:
-        Math.ceil(maxWaitMs / timings.networkErrorRetryMs) + 1,
-    },
-  );
+  session.join(ownMembershipIdentity, [transport], {
+    notificationType: sendNotificationType,
+    callIntent,
+    applicationData: rest,
+    manageMediaKeys: encryptMedia,
+    delayedLeaveEventRestartMs: delayedLeave.restart_ms,
+    delayedLeaveEventDelayMs: delayedLeave.delay_ms,
+    delayedLeaveEventRestartLocalTimeoutMs: delayedLeave.restart_timeout_ms,
+    networkErrorRetryMs: timings.networkErrorRetryMs,
+    makeKeyDelay: timings.waitForKeyRotationMs,
+    membershipEventExpiryMs: timings.membershipEventExpiryMs,
+    keyRotationParticipantLimit: timings.keyRotationParticipantLimit,
+    unstableSendStickyEvents: matrixRTCMode === MatrixRTCMode.Matrix_2_0,
+    maximumNetworkErrorRetryCount:
+      Math.ceil(maxWaitMs / timings.networkErrorRetryMs) + 1,
+  });
 }

src/AppBar.module.css

@@ -7,6 +7,7 @@
   padding-top: env(safe-area-inset-top);
   opacity: 1;
   transition: opacity 0.15s;
+  text-align: center;
 }
 
 /* Pseudo-element for the gradient background */
@@ -52,7 +53,7 @@
     ". . ."
     "primaryButton title secondaryButton"
     ". . .";
-  place-items: center;
+  place-items: center stretch;
   column-gap: var(--cpd-space-2x);
 }