filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,489 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

328 Commits

Author SHA1 Message Date
SpiritCroc 4573a4235e Merge tag 'v1.6.10' into sc 
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
 2024-01-10 19:57:20 +01:00
Benoit Marty 6d65a74f1d Organization renaming: replace all `https://github.com/vector-im` by `https://github.com/element-hq` 2023-12-13 11:01:40 +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
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
Valere dfbb3122e7 Remove legacy crypto code 2023-10-02 13:58:51 +02:00
Jorge Martín 0838a10b65 Bump memory allocated for tests 2023-08-28 15:34:52 +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 dc9e649703 Remove Jcenter repository ref (#2773) 2023-06-23 19:00:06 +02:00
valere 91f507e6c4 revert sonarqube gradle plugin version 2023-06-02 14:27:57 +02:00
dependabot[bot] cb0fb63fe6
Bump org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#8490) 2023-06-01 11:21:27 +00: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
dependabot[bot] ccf77eb05a
Bump com.likethesalad.android:stem-plugin from 2.4.0 to 2.4.1 
Bumps com.likethesalad.android:stem-plugin from 2.4.0 to 2.4.1.

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-22 23:59:34 +00: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 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 38aefb9e33
Merge pull request #8368 from vector-im/dependabot/gradle/org.jlleitschuh.gradle.ktlint-11.3.2 
Bump org.jlleitschuh.gradle.ktlint from 11.3.1 to 11.3.2
 2023-05-05 10:29:15 +02:00
Benoit Marty b063afaa91
Merge pull request #8371 from vector-im/dependabot/gradle/com.likethesalad.android-stem-plugin-2.4.0 
Bump com.likethesalad.android:stem-plugin from 2.3.0 to 2.4.0
 2023-05-05 10:22:15 +02:00
Benoit Marty 48f4ad412f Jitsi 8.1.1 2023-05-02 14:38:40 +02:00
dependabot[bot] 313db8cab1
Bump com.likethesalad.android:stem-plugin from 2.3.0 to 2.4.0 
Bumps com.likethesalad.android:stem-plugin from 2.3.0 to 2.4.0.

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-26 23:57:30 +00:00
dependabot[bot] f5d910c4e9
Bump org.jlleitschuh.gradle.ktlint from 11.3.1 to 11.3.2 
Bumps org.jlleitschuh.gradle.ktlint from 11.3.1 to 11.3.2.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-26 00:00:06 +00:00
dependabot[bot] 347fef225b
Bump com.autonomousapps.dependency-analysis from 1.19.0 to 1.20.0 (#8357) 2023-04-24 07:58:50 +00: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
valere 927f7757cd Merge branch 'develop' into feature/bca/rust_flavor 2023-03-28 17:17:35 +02:00
SpiritCroc 9b384c0971 Update to vanniktechEmoji 0.16.0 to fix compile 
Revert "Use vanniktechEmoji "0.16.0-SNAPSHOT""

This reverts commit a1f4ffbf17.

Change-Id: I66c1490349f26de0f8f7159f4d18027c487b2220
 2023-03-27 12:18:03 +02:00
dependabot[bot] c3114abb05
Bump org.owasp:dependency-check-gradle from 8.1.2 to 8.2.1 (#8273) 
Bumps org.owasp:dependency-check-gradle from 8.1.2 to 8.2.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-24 09:25:58 +00:00
Benoit Marty 8e4bbba7ee
Merge pull request #8200 from vector-im/dependabot/gradle/com.google.firebase-firebase-appdistribution-gradle-4.0.0 
Bump com.google.firebase:firebase-appdistribution-gradle from 3.2.0 to 4.0.0
 2023-03-21 10:29:00 +01:00
Maxime NATUREL 8e9a364c8d
Merge pull request #8204 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.8.10 
Bump org.jetbrains.dokka:dokka-gradle-plugin from 1.7.20 to 1.8.10
 2023-03-10 09:44:51 +01:00
valere 5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00
dependabot[bot] de6171578a Bump com.google.firebase:firebase-appdistribution-gradle 
Bumps com.google.firebase:firebase-appdistribution-gradle from 3.2.0 to 4.0.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-gradle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 14:16:15 +01:00
dependabot[bot] 5117727827
Bump org.jlleitschuh.gradle.ktlint from 11.2.0 to 11.3.1 (#8205) 
Bumps org.jlleitschuh.gradle.ktlint from 11.2.0 to 11.3.1.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-06 07:56:57 +01:00
dependabot[bot] 97741c01cf
Bump org.jetbrains.dokka:dokka-gradle-plugin from 1.7.20 to 1.8.10 
Bumps org.jetbrains.dokka:dokka-gradle-plugin from 1.7.20 to 1.8.10.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 23:59:18 +00:00
Benoit Marty 8bb78ce68b `sonarqube` task is deprecated, use `sonar` now. 2023-03-03 16:40:23 +01:00
dependabot[bot] c4a540722b
Bump org.owasp:dependency-check-gradle from 8.1.1 to 8.1.2 
Bumps org.owasp:dependency-check-gradle from 8.1.1 to 8.1.2.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 11:14:05 +00:00
dependabot[bot] 8e14579886
Bump org.sonarsource.scanner.gradle:sonarqube-gradle-plugin 
Bumps org.sonarsource.scanner.gradle:sonarqube-gradle-plugin from 3.5.0.2730 to 4.0.0.2929.

---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.gradle:sonarqube-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 09:35:39 +00:00
dependabot[bot] 69f8715d03
Bump org.owasp:dependency-check-gradle from 8.1.0 to 8.1.1 (#8184) 
Bumps org.owasp:dependency-check-gradle from 8.1.0 to 8.1.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-28 09:34:53 +00:00
dependabot[bot] 7980dccc9d
Bump org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0 
Bumps org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 23:57:19 +00:00
dependabot[bot] ffce999cba
Bump org.owasp:dependency-check-gradle from 8.0.2 to 8.1.0 
Bumps org.owasp:dependency-check-gradle from 8.0.2 to 8.1.0.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-13 23:59:48 +00:00
Benoit Marty 120dd61123
Merge pull request #8038 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-8.0.2 
Bump org.owasp:dependency-check-gradle from 8.0.1 to 8.0.2
 2023-02-07 14:32:10 +01:00
dependabot[bot] e362536037
Bump com.google.devtools.ksp from 1.8.0-1.0.8 to 1.8.10-1.0.9 
Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.8.0-1.0.8 to 1.8.10-1.0.9.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.8.0-1.0.8...1.8.10-1.0.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-07 11:54:45 +00:00
dependabot[bot] 67ae54f0a5
Bump com.autonomousapps.dependency-analysis from 1.18.0 to 1.19.0 (#8085) 
Bumps com.autonomousapps.dependency-analysis from 1.18.0 to 1.19.0.

---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-07 11:53:49 +00:00
valere b48e6f5d71 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-06 10:29:00 +01:00
dependabot[bot] 8dae126d4c
Bump org.owasp:dependency-check-gradle from 8.0.1 to 8.0.2 
Bumps org.owasp:dependency-check-gradle from 8.0.1 to 8.0.2.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-30 23:12:40 +00:00
dependabot[bot] a7238bdb3b
Bump org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0 
Bumps org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-27 23:03:22 +00:00
valere 8b50fa3828 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-25 15:17:17 +01:00
Benoit Marty 34ac1dee0f
Merge pull request #7972 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-8.0.1 
Bump dependency-check-gradle from 7.4.4 to 8.0.1
 2023-01-24 14:36:17 +01:00
valere 4ee53ad9d0 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-23 09:17:26 +01:00
dependabot[bot] bcc6f475ba
Bump firebase-appdistribution-gradle from 3.1.1 to 3.2.0 
Bumps firebase-appdistribution-gradle from 3.1.1 to 3.2.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-20 07:14:10 +00:00
dependabot[bot] e32417d8c6
Bump google-services from 4.3.14 to 4.3.15 (#7983) 
Bumps google-services from 4.3.14 to 4.3.15.

---
updated-dependencies:
- dependency-name: com.google.gms:google-services
  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>
 2023-01-20 08:12:37 +01:00
dependabot[bot] 206da39ca0
Bump dependency-check-gradle from 7.4.4 to 8.0.1 
Bumps dependency-check-gradle from 7.4.4 to 8.0.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-18 23:04:27 +00:00
valere c0397875f0 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-12 14:51:03 +01:00
dependabot[bot] e502d5d9a6 Bump com.google.devtools.ksp from 1.7.22-1.0.8 to 1.8.0-1.0.8 
Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.7.22-1.0.8 to 1.8.0-1.0.8.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.7.22-1.0.8...1.8.0-1.0.8)

---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
  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