mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-21 15:23:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
25813 commits 7 branches 125 tags 235 MiB
Commit graph

325 commits

Author SHA1 Message Date
valere
3146f5209b Merge branch 'develop' into feature/bca/rust_flavor 2022-12-16 09:33:37 +01:00
SpiritCroc
05fc840b3b [merge] Fix gplay build 
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
 2022-12-15 11:45:48 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc 
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2022-12-15 11:01:52 +01:00
Benoit Marty
8c49609aa6 version++ 2022-12-15 10:20:26 +01:00
Yoan Pintas
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message 
Voice Broadcast - Update last message in the room list
 2022-12-14 17:39:42 +01:00
valere
8555b045e7 Fix CI missing key in map 2022-12-14 13:54:48 +01:00
valere
71d56108c2 Fix ui test compilation 2022-12-14 10:43:03 +01:00
valere
f1e8f846b9 fix test compilation 2022-12-13 17:20:47 +01:00
valere
14cee226c5 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-08 13:37:43 +01:00
jonnyandrew
de18f37849
[Rich text editor] Add error tracking for rich text editor (#7695) 2022-12-08 11:43:19 +00:00
ganfra
ceec2018a7
Merge pull request #7686 from vector-im/dependabot/gradle/com.facebook.soloader-soloader-0.10.5 
Bump soloader from 0.10.4 to 0.10.5
 2022-12-07 20:24:13 +01:00
Florian Renaud
69beef4648 Show voice broadcast events in the room list 
fix factory
 2022-12-07 18:11:51 +01:00
SpiritCroc
87100a8536 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2022-12-07 14:56:07 +01:00
SpiritCroc
001e22bbad Merge tag 'v1.5.11' into sc 
Change-Id: Ia736ee03b924e8ec8f641420eac11f5fc68b69f4
 2022-12-07 14:36:35 +01:00
Benoit Marty
6c84668611 Hotfix 1.5.11 2022-12-07 13:58:02 +01:00
Benoit Marty
988afa4ebe Fix FDroid build 2022-12-06 18:21:07 +01:00
valere
6965c0c5ab move app_name to xml res 2022-12-06 18:11:31 +01:00
Benoit Marty
0d12dbbe7e Disable the Nightly popup, user registration (with updateIfNewReleaseAvailable()) to get upgrade does not work. 
Add a nightly build section in the preferences to manually try to upgrade.
 2022-12-06 12:51:46 +01:00
Benoit Marty
a65e13970d appdistribution is only for nightly builds, not necessary for gplay (prod) builds. 2022-12-06 12:22:50 +01:00
Maxime NATUREL
a2f8fed63c
Merge pull request #7675 from vector-im/fix/mna/unified-push-selection 
ANR when asking to select the notification method
 2022-12-05 16:58:09 +01:00
dependabot[bot]
b4792c8a59
Bump leakcanary-android from 2.9.1 to 2.10 (#7570) 2022-12-05 10:20:02 +01:00
Maxime NATUREL
4dbca7858c Adding new use cases to handle the Unified push registration 2022-12-05 09:41:23 +01:00
valere
ea37029631 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-04 11:13:46 +01:00
valere
a20fd453d9 fix CI exodus/gplay 2022-12-04 10:34:41 +01:00
SpiritCroc
5aa3a4a764 Re-generate icons 
Change-Id: I25836945ef12e1ebd2059983988e4ed44cd3d8d4
 2022-12-03 15:44:11 +01:00
SpiritCroc
2f238efde0 Merge remote-tracking branch 'NathanC/themable-icons' into merge-v1.5.10 
Change-Id: I4abbebfb8f4a322f4a5942a148b6c16a879a4044
 2022-12-03 15:38:45 +01:00
Onuray Sahin
34d29dc9d7
Merge pull request #7694 from vector-im/feature/ons/unverified_sessions_alert 
Remind unverified sessions with a banner once a week (PSG-892)
 2022-12-03 14:23:10 +03:00
valere
03379a6636 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-03 11:15:46 +01:00
Nathan
f32e491c72 Adds in themable icon, with beta variant 2022-12-02 23:57:57 -08:00
SpiritCroc
65be0039a5 Merge tag 'v1.5.10' into merge-v1.5.10 
TODO: re-implement our composer constraint changes

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
	vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt

Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
 2022-12-02 22:03:17 +01:00
valere
ae9711b7d1 Basic sentry e2e reporting for rust + decrypt trust 2022-12-02 18:24:23 +01:00
Onuray Sahin
4050975a19 Implement new logic for new login banner. 2022-12-02 18:15:10 +03:00
valere
cb4720f6d5 CI update for ER 2022-12-02 12:40:48 +01:00
valere
e6444fe9c0 enable analytics by default on nightly 2022-12-02 12:39:13 +01:00
dependabot[bot]
b70370b217
Bump soloader from 0.10.4 to 0.10.5 
Bumps [soloader](https://github.com/facebook/soloader) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/facebook/soloader/releases)
- [Commits](https://github.com/facebook/soloader/commits)

---
updated-dependencies:
- dependency-name: com.facebook.soloader:soloader
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-01 23:02:57 +00:00
Florian Renaud
c20500ab7a
Merge pull request #7590 from vector-im/dependabot/gradle/com.adevinta.android-barista-4.3.0 
Bump barista from 4.2.0 to 4.3.0
 2022-12-01 14:34:53 +01:00
valere
a9b970832e Merge branch 'develop' into feature/bca/rust_flavor 2022-11-30 11:05:32 +01:00
Benoit Marty
52477aa9d5 version++ 2022-11-30 11:03:58 +01:00
dependabot[bot]
b58050f496
Bump kotlin-reflect from 1.7.21 to 1.7.22 (#7665) 
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-30 09:13:47 +00:00
SpiritCroc
39aff9f2cd Increment version 
Change-Id: I456b2fbb19de339bfeac941b42da1aaabab411f8
 2022-11-29 09:27:11 +01:00
Benoit Marty
9ca7415f5a Remove usage of Buildkite. 
Build number is just removed.
Related script will need to be updated separately.
 2022-11-24 14:49:55 +01:00
SpiritCroc
20081e8806 Log exit reason 
Change-Id: I1c2e43781f41a739fdd90a74f982ae83704863b7
 2022-11-19 15:43:28 +01:00
SpiritCroc
3eeca39c4b Merge tag 'v1.5.8' into sc 
Release 1.5.8

Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
 2022-11-18 16:11:16 +01:00
Benoit Marty
65d898e3de version++ 2022-11-17 12:57:08 +01:00
Valere
cf366f7a9c suspend verif WIP 2022-11-16 09:12:54 +01:00
dependabot[bot]
e4caf7be81
Bump barista from 4.2.0 to 4.3.0 
Bumps [barista](https://github.com/AdevintaSpain/Barista) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases)
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.2.0...4.3.0)

---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-15 23:03:53 +00:00
Benoit Marty
f203e5ac3a
Merge pull request #7536 from vector-im/dependabot/gradle/com.google.android.gms-play-services-location-21.0.1 
Bump play-services-location from 21.0.0 to 21.0.1
 2022-11-10 16:25:51 +01:00
SpiritCroc
773df1f4cc Merge tag 'v1.5.7' into merge-v1.5.7 
Change-Id: I5d64f28783cb2d9a331e97ccfb5b0855fe915c6e
 2022-11-10 09:55:04 +01:00
dependabot[bot]
25d33e9b1a
Bump kotlin-reflect from 1.7.20 to 1.7.21 
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-08 23:11:03 +00:00
dependabot[bot]
3a5af934cc
Bump play-services-location from 21.0.0 to 21.0.1 
Bumps play-services-location from 21.0.0 to 21.0.1.

---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-location
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-07 23:15:05 +00:00