mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 11:58:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
12069 commits 7 branches 124 tags 230 MiB
Commit graph

12069 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Brown
7105a20f4f fixes notifications not being marked as read when the last chunk containing the event is no longer the latest 
- use explict returns constants to attempt to add more documentation
- queries for the existence of the event in all of the chunk history and if a read receipt exists in the latest chunk (which it should if a user has just read on another client) which allows us to mark old notifications events as read
 2021-09-30 17:15:04 +01:00
Benoit Marty
2b38c607b2
Merge pull request #4127 from kittykat/issue-template 
Fix typo in string
 2021-09-30 17:20:01 +02:00
Ekaterina Gerasimova
d6da4f7834 Fix typo in string 
Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
 2021-09-30 15:58:22 +01:00
ganfra
845c396f8f Clean code after PR review 2021-09-30 16:43:49 +02:00
Benoit Marty
3719382569
Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0 
Bump work-runtime-ktx from 2.5.0 to 2.6.0
 2021-09-30 14:25:43 +02:00
Benoit Marty
8cfd4bae35
Merge pull request #4120 from vector-im/dependabot/gradle/dagger-2.39 
Bump dagger from 2.38.1 to 2.39
 2021-09-30 14:19:09 +02:00
ganfra
be8c6f1836 Merge branch 'develop' into feature/fga/expose_sync 2021-09-30 12:10:38 +02:00
Benoit Marty
3f7e810f14 Handle change from WorkManager 2.6.0. 
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
 2021-09-30 12:06:57 +02:00
ganfra
3df004b035 Merge branch 'develop' into feature/fga/text_composer_extract 2021-09-30 12:02:27 +02:00
ganfra
535a2c931b Clean code and add changelog 2021-09-30 12:02:05 +02:00
Valere
4880df3555 Change call to action in filter room when space selected 2021-09-30 11:58:21 +02:00
ganfra
a171f1912a TextComposer: makes animation ok 2021-09-30 11:57:57 +02:00
Benoit Marty
5d51431c60
Merge pull request #4078 from abaker/android_auto 
Add Android Auto notification support
 2021-09-30 11:29:58 +02:00
SpiritCroc
3ca6676629 Fix alternative_package.sh for SchildiChat dependencies 
Do not rename dependencies

Change-Id: I7e1990deaf2f223c929f8cb986bae20f8a5ed685
 2021-09-30 09:49:12 +02:00
SpiritCroc
c42d5dd24d Automatic SchildiChat string correction 
Change-Id: I944383417c465fe10bf54d030e3fb58826320517
 2021-09-30 09:30:53 +02:00
SpiritCroc
6464142a91 Automatic upstream merge postprocessing 
Change-Id: I1e1f12676768cf300e99e10e0c4d2a7c70ee859a
 2021-09-30 09:30:52 +02:00
SpiritCroc
38ae03893f Merge tag 'v1.3.1' into sc 
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
 2021-09-30 09:27:15 +02:00
SpiritCroc
e9e6275335 [TMP] Automatic upstream merge preparation 
Change-Id: If69bf7097f303eeac3d7a5878ade87e2bae28315
 2021-09-30 09:19:30 +02:00
SpiritCroc
1019564952 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia971d3f314a302ed77749900c72c82b372ddefec
 2021-09-30 09:19:30 +02:00
SpiritCroc
de0f44307b Switch to own UP FCM fork for now 
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
 2021-09-30 09:18:57 +02:00
Valere
2605433a3d Code review 2021-09-30 09:15:13 +02:00
SpiritCroc
a7f41e88f3 Fix FCM error always showing, even when it works 
Change-Id: Ic9ed2bf74c252ee8b923f996642285681f504420
 2021-09-30 08:51:48 +02:00
dependabot[bot]
bea8d097e2
Bump dagger from 2.38.1 to 2.39 
Bumps `dagger` from 2.38.1 to 2.39.

Updates `dagger` from 2.38.1 to 2.39
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38.1...dagger-2.39)

Updates `dagger-compiler` from 2.38.1 to 2.39
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38.1...dagger-2.39)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-29 23:06:31 +00:00
ganfra
6b3a407b79 TextComposer: continue reworking. WIP 2021-09-29 19:21:11 +02:00
Benoit Marty
d5f9d8086a
Merge pull request #4049 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5 
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
 2021-09-29 17:10:31 +02:00
Benoit Marty
0033378f8b
Merge pull request #4050 from vector-im/dependabot/gradle/kotlin-1.5.31 
Bump kotlin from 1.5.30 to 1.5.31
 2021-09-29 17:09:39 +02:00
Benoit Marty
c0adde56df
Merge pull request #4027 from vector-im/feature/fre/permalink 
Add client base url support for permalinks
 2021-09-29 17:08:12 +02:00
Benoit Marty
a9525bf92c
Merge pull request #4118 from vector-im/feature/bca/spaces_fix_3935 
Fix do not hide toolbar on scroll
 2021-09-29 16:35:56 +02:00
Valere
3d38ec7aeb Fix do no hide toolbar on scroll 2021-09-29 15:09:59 +02:00
Benoit Marty
856fc8f976
Merge pull request #4092 from ryg-git/issue-3869 
Focus on search bar when opening reaction view
 2021-09-29 15:07:07 +02:00
Benoit Marty
357d7ee338
Merge pull request #4115 from vector-im/feature/adm/login-key-verification-flow 
Skipping passphrase screen when no passphrase is available
 2021-09-29 15:04:58 +02:00
Benoit Marty
aa4e804261
Merge pull request #4114 from kittykat/issue-template 
Fix release label in release issue template
 2021-09-29 14:57:00 +02:00
Benoit Marty
31a7bfed02 version++ 2021-09-29 14:56:10 +02:00
Benoit Marty
8937a0f569 Merge branch 'release/1.3.1' into main 2021-09-29 14:52:27 +02:00
Benoit Marty
c4539abe4c Merge branch 'release/1.3.1' into develop 2021-09-29 14:52:26 +02:00
Valere
cdc6b7e7d5 Remove listener use fragmentCallback 2021-09-29 14:40:18 +02:00
Adam Brown
984ab08823 adding changelog entry 2021-09-29 13:36:41 +01:00
Benoit Marty
6e72287464 Fastlane changelog 2021-09-29 14:28:08 +02:00
Benoit Marty
63e52226c6 Towncrier 2021-09-29 14:25:26 +02:00
Adam Brown
b55e94b938 extracting the rx instant setup to a reuseable test rule 2021-09-29 13:23:40 +01:00
Benoit Marty
b5614a1cd5 SQ descriptions are now available 2021-09-29 14:18:52 +02:00
Adam Brown
daa3125e57 adding test cases around the SharedSecureStorageViewModel initial state and back flow 
- introduces a temporary workaorund the unit tests Mavericks by including a no op LifecycleRegistry
- manually sets instant rx schedulers via the static helpers, the layers that set the schedulers are not currently injectable
 2021-09-29 13:14:22 +01:00
Ekaterina Gerasimova
77486abbd9 Fix release label in release issue template 
https://github.com/vector-im/element-android/issues/4113

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
 2021-09-29 13:12:43 +01:00
Adam Brown
edce14f48f when the keyinfo doesn't contain a passphrase we shouldn't view the passphrase screen 
fixed by handling the back case to skip the passphrase screen if we don't have one
 2021-09-29 13:11:19 +01:00
Benoit Marty
65dc2a7f04
Merge pull request #4111 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-09-29 12:36:50 +02:00
Weblate
e3e18b4ce8 Merge branch 'origin/develop' into Weblate. 2021-09-29 10:05:06 +00:00
Besnik Bleta
3f73dfcac6 Translated using Weblate (Albanian) 
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2021-09-29 10:01:58 +00:00
waclaw66
7ff29ebfc5 Translated using Weblate (Czech) 
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-09-29 10:01:56 +00:00
Jeff Huang
26689ac111 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-09-29 10:01:55 +00:00
Danial Behzadi
64f845c372 Translated using Weblate (Persian) 
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-09-29 10:01:54 +00:00