filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-27 09:31:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from NoCloud-today/chore/resolve-notifications-mr

Browse Source 
Chore/resolve notifications mr
This commit is contained in:
GlebMikhailov 2024-12-24 03:27:12 +03:00 committed by GitHub
commit bc5415bf73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fastlane/metadata/android/en-US/changelogs/40101340.txt Normal file
View File

@ -0,0 +1 @@
Update codebase to Element v1.6.26

10
vector-app/build.gradle
View File

@ -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

3
vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
View File

@ -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

2
vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt
View File

@ -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(