mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-25 02:18:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
12560 commits 7 branches 124 tags 230 MiB
Commit graph

12560 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
b30f583f13 [merge-fixup] Delete TestFirebaseToken, we use unifiedpush 
Change-Id: I62dc2801798d99cd83b2c0df97a0ab6cf2004a1c
 2021-11-20 09:41:33 +01:00
S1m
cef51619b1 Move GuardService to main 
Users using the gcm flavor without playservice will be able to
use the background sync.
 2021-11-17 21:00:09 +01:00
S1m
c4fd115209 Add a BuildConfig to allow external unifiedpush distrib 
Change-Id: I5435c02dab05f84dd5dd99507afd1075f357e76d
 2021-11-17 20:59:32 +01:00
SpiritCroc
c03c6867f7 Merge branch 'merge-v1.3.8' into sc 
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38

Conflicts:
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
 2021-11-17 20:26:27 +01:00
SpiritCroc
519f18eed9 Automatic SchildiChat string correction 
Change-Id: I1c1258626a5c15c00dbfdeb855d1cb9b4a0c20a8
 2021-11-17 20:20:46 +01:00
SpiritCroc
54fba60046 Automatic upstream merge postprocessing 
Change-Id: I53832e007d7c439a60c9e38e8c736aec6631b6ba
 2021-11-17 20:20:45 +01:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD 
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-11-17 20:17:45 +01:00
SpiritCroc
c5f48fa4d2 Merge tag 'v1.3.7' into sc 
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
 2021-11-17 19:01:22 +01:00
Benoit Marty
879e6ef5e2 Merge branch 'release/1.3.8' into main 2021-11-17 16:04:44 +01:00
Benoit Marty
7783057eac fastlane 2021-11-17 16:04:26 +01:00
Benoit Marty
cc967103c1 Towncrier 2021-11-17 15:56:09 +01:00
Benoit Marty
a5518e90ae
Merge pull request #4485 from vector-im/feature/bma/small_cleanup 
Small cleanup after content scanner code has been merged
 2021-11-17 15:08:07 +01:00
Benoit Marty
36ffb3b073 Fix lint issue 2021-11-17 14:18:12 +01:00
Benoit Marty
31837390bc
Merge pull request #4484 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-11-17 11:48:00 +01:00
Benoit Marty
c0af8214a6 Improve and use MatrixUrls 2021-11-17 11:27:59 +01:00
Benoit Marty
0fd29d763c
Markdown and sploiler in roomlist + spoiler in notifications (#4483) 
Render markdown in room list and make notifications spoiler aware, per MSC3124
Reorder when case to put the most common on top

Co-authored-by: Onuray Sahin <onurays@element.io>
Co-authored-by: Wasabi\preston <1337paf92@gmail.com>
 2021-11-17 10:21:48 +00:00
Benoit Marty
adea1db87a Remove useless ? 2021-11-17 11:19:59 +01:00
Benoit Marty
855b672f48
Add content scanner service (#4392) 
* Add content scanner APIs

* Move to content scanner matrix SDK to FOSS

* Update file service

* Refactoring

* Replace matrix callbacks by coroutines

* Fix lint errors

* Add changelog

Co-authored-by: yostyle <yoanp@element.io>
 2021-11-17 11:18:20 +01:00
yostyle
0fada97450 Add changelog 2021-11-17 11:11:13 +01:00
Weblate
e279ffa1d8 Merge branch 'origin/develop' into Weblate. 2021-11-17 09:59:36 +00:00
Fjoerfoks
34ae53f813 Translated using Weblate (Frisian) 
Currently translated at 45.9% (17 of 37 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
 2021-11-17 09:59:23 +00:00
Ihor Hordiichuk
b4751bc75c Translated using Weblate (Ukrainian) 
Currently translated at 91.7% (2454 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-11-17 09:59:23 +00:00
m1chj
fb2a2ec252 Translated using Weblate (Polish) 
Currently translated at 92.2% (2469 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-17 09:59:22 +00:00
Line
1b8c747b00 Translated using Weblate (Latvian) 
Currently translated at 90.5% (2421 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2021-11-17 09:59:22 +00:00
Linerly
b84aebb7d8 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2675 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-11-17 09:58:50 +00:00
Fjoerfoks
c0bd299b04 Translated using Weblate (Frisian) 
Currently translated at 42.4% (1135 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-11-17 09:58:50 +00:00
waclaw66
f533fed55d Translated using Weblate (Czech) 
Currently translated at 100.0% (2675 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-11-17 09:58:50 +00:00
Ekaterina Gerasimova
36c312b1a6 Add issue workflow automation for Threads 
Fixes #4461

Covered by changelog entry 4435.misc
 2021-11-17 09:41:34 +00:00
Adam Brown
10a460bf0c
Sign out crash - Realm configuration mismatch (#4480) 
Dispatching session events to a specified session instance instead of always querying the session manager
- fixes the close session flow causing the session to be recreated
 2021-11-17 10:39:46 +01:00
Benoit Marty
2a051a146c
Merge pull request #4481 from vector-im/dependabot/gradle/mockk-1.12.1 
Bump mockk from 1.12.0 to 1.12.1
 2021-11-17 10:35:17 +01:00
m1chj
f8042893c8 Translated using Weblate (Polish) 
Currently translated at 92.2% (2469 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-17 07:26:33 +00:00
eman luff
c070cfc2af Translated using Weblate (Polish) 
Currently translated at 92.2% (2469 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-17 07:26:33 +00:00
dependabot[bot]
d763c61c61
Bump mockk from 1.12.0 to 1.12.1 
Bumps `mockk` from 1.12.0 to 1.12.1.

Updates `mockk` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1)

Updates `mockk-android` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-16 23:08:15 +00:00
SpiritCroc
7aec888940 Bring back notices for kicks 
Change-Id: I8bac582658fc2e2b0829c4ee15e251f88d972d80
 2021-11-16 16:09:32 +01:00
Benoit Marty
10ec6e7435
Merge pull request #4257 from opusforlife2/FR_template 
Remove redundant text in feature request issue form
 2021-11-16 13:34:44 +01:00
Benoit Marty
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12 
Android12
 2021-11-16 13:27:33 +01:00
Benoit Marty
dddcbfbe7d Fix "PendingIntents attached to actions with remote inputs must be mutable" 
Room notifications are now working on Android 12 emulator
 2021-11-16 12:27:54 +01:00
Ekaterina Gerasimova
baed0dcb3e Move P1 issues to app team and crypto boards 2021-11-16 11:09:12 +00:00
m1chj
b158b8f899 Translated using Weblate (Polish) 
Currently translated at 92.2% (2467 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 10:39:50 +00:00
eman luff
5258cbd0c2 Translated using Weblate (Polish) 
Currently translated at 92.2% (2467 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 10:39:50 +00:00
m1chj
3887692a8e Translated using Weblate (Polish) 
Currently translated at 92.1% (2466 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 10:08:41 +00:00
eman luff
f53dd33472 Translated using Weblate (Polish) 
Currently translated at 92.1% (2466 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 10:08:41 +00:00
m1chj
597da4f9e3 Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:18:30 +00:00
eman luff
3a1b50f6a2 Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:18:30 +00:00
mohzart
db299a2c33 Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:17:37 +00:00
Adam Tomaja
2077eda611 Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:17:37 +00:00
m1chj
f59ac641bb Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:17:37 +00:00
Keij0
027807b9be Translated using Weblate (Polish) 
Currently translated at 92.0% (2463 of 2675 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-16 09:17:31 +00:00
Benoit Marty
8d8565ca63 Quick fix on this file 2021-11-15 21:37:51 +01:00
Benoit Marty
eb39b37374 Fix warning after rebase (it's for test, so OK to suppress warning) 2021-11-15 21:35:01 +01:00