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

260 commits

Author SHA1 Message Date
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
Valere
8cd51ea803 Setting version for the release 1.6.3 2023-06-27 10:04:39 +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
valere
268cbb83cd Make cryptoDevice calls suspendable 2023-05-30 23:47:50 +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
Benoit Marty
622aa88f86 Remove LegacySessionImporter, and the dialog which explains that Riot is now Element. 2023-05-05 16:04:30 +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
b1f178ad9f missing corroded google-service 2023-03-30 13:29:31 +02:00
valere
da4055f860 UI tests are disabled on CI 2023-03-29 10:00:32 +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
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
valere
a70e3c2533 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-07 11:36:11 +01:00
valere
82a7f29497 disabled temporary analytics opt-in 2023-02-03 09:47:47 +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