mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
25435 commits 6 branches 120 tags 229 MiB
Commit graph

164 commits

Author SHA1 Message Date
SpiritCroc
86317190c4 Increment version 
Change-Id: I35b83dc3f579688f9c580c243e933a95b908952a
 2023-12-07 17:51:38 +01:00
SpiritCroc
b2c8548e29 Merge tag 'v1.6.8' into sc 
tag

Change-Id: I0a2384fc2e4eda861a191b0b8c85641916854ac8

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
 2023-11-28 20:04:00 +01:00
Benoit Marty
454ba7bf7c
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-11-07 14:13:56 +01:00
Yoan Pintas
b14338d2c4
Remove unused WebRTC dependency (#8658) 2023-11-07 14:12:27 +01:00
SpiritCroc
3a7b2e8d1d Increment version 
Change-Id: I0e3ba74ecbaf84d5e96411d85ab0627d2abbc9e2
 2023-10-13 09:17:22 +02:00
Valere
25ecd599f3 Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-10-10 13:00:45 +02:00
SpiritCroc
1892cf0ff8 Merge tag 'v1.6.6' into sc 
Change-Id: I785561f0b2283214dd419a6c7028e374b85dc598

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2023-10-05 17:23:23 +02:00
ganfra
ecd1057ce9 version++ 2023-10-05 17:00:51 +02:00
Valere
dfbb3122e7 Remove legacy crypto code 2023-10-02 13:58:51 +02:00
SpiritCroc
1a47878318 Increment version 
Change-Id: Ibd52a8f3dcc58279d789f453f4d2ed5303752711
 2023-09-28 11:14:57 +02:00
SpiritCroc
6c3c0dbc66 Fix typo 
Change-Id: I867f7003604c8505eb87affbd31b14de26d729f4
 2023-08-06 19:03:37 +02:00
SpiritCroc
b98153c4dd Increment version 
Change-Id: If0173218f423a5f872232fe5663bd0d77078ccfe
 2023-08-06 18:57:54 +02:00
SpiritCroc
7fb2e3fdf7 Make split ABI fdroid-checkupdates-friendly 
This partially reverts 92e9d9e747.

Change-Id: I6f3d84db8ef75a363761cbd6fa2b90f2e657f72b
 2023-08-06 18:06:22 +02:00
SpiritCroc
e448cce8d9 Increment version 
Change-Id: Ica574ddd60dd46b0dfaf2c422dcd144f438c5d71
 2023-08-05 17:04:55 +02:00
SpiritCroc
6b5bfde91e Merge tag 'v1.6.5' into sc 
tag

Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
 2023-07-26 11:01:57 +02:00
Benoit Marty
9aeb3b7074 version++ 2023-07-25 14:58:22 +02:00
SpiritCroc
92e9d9e747 Enable split ABI support 
https://github.com/SchildiChat/SchildiChat-android/issues/183

Change-Id: Ia8eff01c973d365d6d4a4390153f23510ab77e0e
 2023-07-21 15:10:01 +02:00
SpiritCroc
22b5d7d6bd Increment version 
Change-Id: I37bb4499dba5aae301cd6f34a6241de6e0328184
 2023-07-18 09:28:48 +02:00
SpiritCroc
1aa3337cba Merge tag 'v1.6.3' into sc 
tag

Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
 2023-06-27 20:13:46 +02:00
Benoit Marty
2b4b5f05eb
Merge pull request #8556 from vector-im/feature/bma/noJcenter 
Feature/bma/no jcenter
 2023-06-27 17:04:59 +02:00
Valere
7b8cf5d917 version++ 2023-06-27 13:30:17 +02:00
Valere
8cd51ea803 Setting version for the release 1.6.3 2023-06-27 10:04:39 +02:00
Benoit Marty
69680a9856 Import source from https://github.com/2dxgujun/Kpan 2023-06-23 18:23:14 +02:00
SpiritCroc
f440628208 Merge tag 'v1.6.2' into sc 
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2023-06-05 14:59:06 +02:00
Valere
3c08fb637a version++ 2023-06-02 18:05:49 +02:00
SpiritCroc
9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
Benoit Marty
8f69e411d7 version++ 2023-05-25 11:22:07 +02:00
Benoit Marty
82748591f9 Setting version for the release 1.6.1 2023-05-25 11:05:07 +02:00
SpiritCroc
d9c1ec588d Merge tag 'v1.6.0' into sc 
v1.6.0

Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b

Conflicts:
	library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/xml/vector_settings_help_about.xml
 2023-05-22 14:19:46 +02:00
Benoit Marty
66aa4226b5 version++ 2023-05-17 14:55:30 +02:00
Benoit Marty
134992cf0d Setting version for the release 1.6.0 2023-05-17 12:10:23 +02:00
SpiritCroc
9bfec0818a Increment version 
Change-Id: I7292196817666e2f6a0b8b980f5da9d55fe7f64a
 2023-05-17 10:33:49 +02:00
valere
04f5ae1fc3 Fix rust nightly shoud replace the kotlin app 2023-05-12 15:19:06 +02:00
Benoit Marty
e64d834264 Rust Crypto SDK is now the default, and the build will replace the existing application. 2023-05-09 22:07:08 +02:00
Benoit Marty
672151b8a2 Fix nightly and release build by temporarily deactivate removeUnusedCode. Related to #8408 2023-05-09 14:29:58 +02:00
dependabot[bot]
9fbf34f7e5
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.10 to 1.8.21 
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.8.10 to 1.8.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/compare/v1.8.10...v1.8.21)

---
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-05-05 09:09:58 +00:00
Benoit Marty
67095f81a7
Merge pull request #8348 from vector-im/dependabot/gradle/com.google.android.gms-play-services-oss-licenses-17.0.1 
Bump com.google.android.gms:play-services-oss-licenses from 17.0.0 to 17.0.1
 2023-05-05 10:28:55 +02:00
SpiritCroc
7e7110d8ca Increment version 
Change-Id: I0e71f58242dcba7cb534049ad8a2147699c00c75
 2023-04-23 11:03:51 +02:00
Benoit Marty
8a3d29d630 Fix typo to be able to upload nightly build. 2023-04-21 12:58:52 +02:00
dependabot[bot]
9070e776e6
Bump com.google.android.gms:play-services-oss-licenses 
Bumps com.google.android.gms:play-services-oss-licenses from 17.0.0 to 17.0.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-20 23:57:17 +00:00
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
valere
b2c7f05a10 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-20 09:51:17 +02:00
ganfra
83296727a2 version++ 2023-04-19 16:26:20 +02:00
SpiritCroc
423f841a2a Increment version 
Change-Id: I2a76553af45c7056f04cc1cfa0909ab86c4f147a
 2023-04-15 17:02:00 +02:00
valere
3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +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
valere
638442f6f0 remove app_name from resource 2023-03-15 09:20:03 +01:00
valere
5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00