mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 22:18:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
24194 commits 6 branches 120 tags 229 MiB
Commit graph

203 commits

Author SHA1 Message Date
SpiritCroc
acdf419768 Merge tag 'v1.5.32' into sc 
Note: mainly conflicts in differing implementations to fix duplicate
read receipts.

After a quick glance at the upstream implementation, my first impression
is that we likely want to keep our downstream implementation:
- Better performance by checking for the more recent receipt in the SDK
  upon receipt receival, instead on rendering the timeline
- null seems to always map to main, which caused us jumping receipts in
  the past, which we have addressed by now

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt

Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de
 2023-04-20 10:53:09 +02:00
SpiritCroc
423f841a2a Increment version 
Change-Id: I2a76553af45c7056f04cc1cfa0909ab86c4f147a
 2023-04-15 17:02:00 +02:00
SpiritCroc
965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
Jorge Martín
c6e612c058 version++ 2023-04-05 10:18:30 +02:00
SpiritCroc
c3077c1ff9 Increment version 
Change-Id: I62c495d2a018f29ad88afc6058972608273b357d
 2023-04-01 11:20:55 +02:00
SpiritCroc
19881a9f70 Merge tag 'v1.5.28' into sc 
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
 2023-03-08 20:27:57 +01:00
dependabot[bot]
ea6279ee89
Bump fragment from 1.6.0-alpha04 to 1.6.0-alpha06 (#8165) 
* Bump fragment from 1.6.0-alpha04 to 1.6.0-alpha06

Bumps `fragment` from 1.6.0-alpha04 to 1.6.0-alpha06.

Updates `androidx.fragment:fragment-ktx` from 1.6.0-alpha04 to 1.6.0-alpha06

Updates `androidx.fragment:fragment-testing` from 1.6.0-alpha04 to 1.6.0-alpha06

Updates `androidx.fragment:fragment-testing-manifest` from 1.6.0-alpha04 to 1.6.0-alpha06

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Replace deprecated methods

* Fix tests

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: yostyle <y.pintas@gmail.com>
 2023-03-08 17:58:08 +01:00
ganfra
6491d0d89f version++ 2023-03-08 17:33:12 +01:00
SpiritCroc
1f7ff4aec7 Increment version 
Change-Id: I9677db74deb15c841e318002f2781ea13b2d5dfa
 2023-03-05 10:18:41 +01:00
SpiritCroc
38c8e30541 Merge tag 'v1.5.26' into sc 
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/timeline/factory/MessageItemFactory.kt
	vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
 2023-02-23 11:55:21 +01:00
ganfra
a98dc86e34 version++ 2023-02-22 17:51:12 +01:00
SpiritCroc
6887589b9e Increment version 
Change-Id: I41282c5ec503eeb7e54c9e45dfb8b801b6b7304a
 2023-02-18 11:00:09 +01:00
SpiritCroc
daacdd038c Merge tag 'v1.5.25' into sc 
Change-Id: I45d2198b25e7ebee157f4836596ef59ddb1fbe8e
 2023-02-15 15:53:00 +01:00
Benoit Marty
bb08def69b Hotfix 1.5.25 2023-02-15 10:18:02 +01:00
SpiritCroc
51274af2fe Merge tag 'v1.5.24' into sc 
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.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/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
 2023-02-08 13:08:42 +01:00
Benoit Marty
4174023958 version++ 2023-02-08 09:52:32 +01:00
Benoit Marty
4ba84ddc82
Merge pull request #8064 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.8.10 
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
 2023-02-07 14:30:50 +01:00
dependabot[bot]
a8be83917a
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10 
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10)

---
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>
 2023-02-02 23:03:38 +00:00
Florian Renaud
9383319b37 Fix import 2023-02-01 23:26:49 +01:00
Florian Renaud
9a31aa3b91 Move clock to core-utils module 2023-01-31 16:45:48 +01:00
SpiritCroc
d8bd92c413 Merge tag 'v1.5.22' into sc 
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0

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/timeline/LoadTimelineStrategy.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/list/RoomSummaryItemFactory.kt
 2023-01-26 19:49:36 +01:00
Benoit Marty
cb093e0496 version++ 2023-01-25 14:06:48 +01:00
SpiritCroc
d4cb55eeaa Merge tag 'v1.5.20' into sc 
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
 2023-01-13 14:50:46 +01:00
Benoit Marty
242596744a Use Fragment 1.6.0 alpha to fix issue with test 
https://issuetracker.google.com/issues/128612536
 2023-01-11 12:13:45 +01:00
Benoit Marty
d686d7aab2 Project property value can only be strings. 
Fix
> Failed to notify project evaluation listener.
   > Could not create task ':element-android:matrix-sdk-android:compileDebugAndroidTestKotlin'.
      > Could not create task of type 'KotlinCompile'.
         > class java.util.LinkedHashMap cannot be cast to class java.lang.String (java.util.LinkedHashMap and java.lang.String are in module java.base of loader 'bootstrap')
 2023-01-11 12:13:00 +01:00
dependabot[bot]
2614911631 Bump kotlin-reflect from 1.7.22 to 1.8.0 
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.22 to 1.8.0.
- [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.22...v1.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-11 12:13:00 +01:00
Benoit Marty
b4e6656c42 version++ 2023-01-10 16:24:24 +01:00
Maxime NATUREL
12ccf13171 Use Firebase BOM 2023-01-04 16:02:04 +01:00
dependabot[bot]
c8595df658 Bump firebase-messaging from 23.1.0 to 23.1.1 
Bumps firebase-messaging from 23.1.0 to 23.1.1.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-04 16:02:04 +01:00
SpiritCroc
dadeadcad4 Merge tag 'v1.5.18' into sc 
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
 2023-01-02 17:57:49 +01:00
Benoit Marty
5ee3ae5eea version++ 2023-01-02 13:39:05 +01:00
SpiritCroc
25dddf7566 Merge tag 'v1.5.16' into sc 
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2022-12-30 17:58:06 +01:00
valere
ea2c41b818 version++ 2022-12-29 18:24:33 +01:00
valere
53b1bec5db try fix lint 2022-12-29 10:51:57 +01:00
valere
6f5d8d6ece FIx UI Tests 2022-12-28 18:09:28 +01:00
NIkita Fedrunov
d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
SpiritCroc
e054828370 Merge tag 'v1.5.14' into sc 
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
 2022-12-21 09:57:40 +01:00
Benoit Marty
67e15a42c0 Version++ 2022-12-20 16:50:08 +01:00
Benoit Marty
576ea2df55 Prepare hotfix 1.5.14 2022-12-20 16:44:11 +01:00
SpiritCroc
f5dcf25a6d Merge tag 'v1.5.13' into sc 
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
 2022-12-19 18:04:43 +01:00
Benoit Marty
4f7bbd6ada Merge hotfix 1.5.13 2022-12-19 16:58:09 +01:00
Benoit Marty
ed01f32393 Add largeHeap=true in the manifest since we are seeing more crashes (OOM) when handling sync response. 2022-12-19 16:54:15 +01:00
Benoit Marty
ffa49870a9 Version 1.5.13 2022-12-19 16:52:32 +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
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