From 38bfec6044400b057814945810835330e33d4258 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 22 Dec 2024 14:05:24 +0100 Subject: [PATCH 1/3] Increment version Change-Id: I935cd9a965c94fed0542a1bcfc5248dcb5557aa8 --- .../metadata/android/en-US/changelogs/40101340.txt | 1 + vector-app/build.gradle | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/40101340.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40101340.txt b/fastlane/metadata/android/en-US/changelogs/40101340.txt new file mode 100644 index 0000000000..c7999d93b4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40101340.txt @@ -0,0 +1 @@ +Update codebase to Element v1.6.26 diff --git a/vector-app/build.gradle b/vector-app/build.gradle index ffc3519f53..cf6b551574 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -39,7 +39,7 @@ ext.versionMinor = 6 // is the value for the next regular release. ext.versionPatch = 26 -ext.scVersion = 83 +ext.scVersion = 84 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' @@ -154,8 +154,8 @@ android { renderscriptTargetApi 24 renderscriptSupportModeEnabled true - versionCode 40101330 - versionName "1.6.24.sc83" + versionCode 40101340 + versionName "1.6.26.sc84" // Generate a random app task affinity manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"] @@ -317,14 +317,14 @@ android { } dimension "store" - versionName "1.6.24.sc83" + versionName "1.6.26.sc84" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"" } fdroid { dimension "store" - versionName "1.6.24.sc83" + versionName "1.6.26.sc84" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" isDefault = true From 2895c3184f865bc4e0756a545c91f98bb6aa96c7 Mon Sep 17 00:00:00 2001 From: developerandr Date: Tue, 24 Dec 2024 03:04:17 +0300 Subject: [PATCH 2/3] Chore: Fix FakeNotificationFactory --- .../java/im/vector/app/test/fakes/FakeNotificationFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt index eac61bfe29..d4e157a3b3 100644 --- a/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt +++ b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt @@ -33,7 +33,7 @@ class FakeNotificationFactory { with(instance) { every { groupedEvents.roomEvents.toNotifications(myUserDisplayName, myUserAvatarUrl) } returns roomNotifications every { groupedEvents.invitationEvents.toNotifications(myUserId) } returns invitationNotifications - every { groupedEvents.simpleEvents.toNotifications() } returns simpleNotifications + every { groupedEvents.simpleEvents.toNotifications(myUserId) } returns simpleNotifications every { createSummaryNotification( From 1cdfd3dbeb367ce02e3a7dc80d3b64b4c7297a5a Mon Sep 17 00:00:00 2001 From: developerandr Date: Tue, 24 Dec 2024 03:24:32 +0300 Subject: [PATCH 3/3] Chore: Remove jitsiNotificationsUtils from the SingletonEntryPoint --- .../src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt index c707e3b387..ee7fa54254 100644 --- a/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt +++ b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt @@ -16,7 +16,6 @@ import im.vector.app.features.analytics.AnalyticsTracker import im.vector.app.features.call.webrtc.WebRtcCallManager import im.vector.app.features.home.AvatarRenderer import im.vector.app.features.navigation.Navigator -import im.vector.app.features.notifications.JitsiNotificationsUtils import im.vector.app.features.notifications.NotificationUtils import im.vector.app.features.pin.PinLocker import im.vector.app.features.rageshake.BugReporter @@ -36,8 +35,6 @@ interface SingletonEntryPoint { fun notificationUtils(): NotificationUtils - fun jitsiNotificationsUtils(): JitsiNotificationsUtils - fun activeSessionHolder(): ActiveSessionHolder fun unrecognizedCertificateDialog(): UnrecognizedCertificateDialog