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

12044 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
b4247550ec run ktlint after rebase 2021-10-01 17:20:30 +02:00
ganfra
606cddc826 Mavericks 2: replace MvRxViewModelFactory by MavericksViewModelFactory 2021-10-01 17:11:53 +02:00
ganfra
d63e1ecfea Mavericks 2: replacing rx by flow 2021-10-01 17:08:09 +02:00
ganfra
bbce37e694 Mavericks 2: start replacing rx by flow 2021-10-01 16:34:47 +02:00
Benoit Marty
8d7f542e88
Merge pull request #4132 from vector-im/feature/bma/init_sync_dialog 
Ensure initial sync progress dialog is hidden when the initial sync is over
 2021-10-01 15:59:55 +02:00
Benoit Marty
19ae298707 Add documentation about Figma -- very first draft 2021-10-01 15:57:41 +02:00
Benoit Marty
63d71cf56f
Merge branch 'develop' into feature/bma/ktlint_cleanup 2021-10-01 15:54:21 +02:00
Adam Brown
f9d2f236a4 using named parameters when the same types are used in close proximity 2021-10-01 14:43:39 +01:00
ganfra
9337e0e76d Mavericks 2: create sdk flow module 2021-10-01 15:19:48 +02:00
Benoit Marty
679f0a5940 Ensure initial sync progress dialog is hidden when the initial sync is over 2021-10-01 15:03:23 +02:00
Benoit Marty
8644363005
Merge pull request #4125 from vector-im/feature/fga/text_composer_extract 
Feature/fga/text composer extract
 2021-10-01 14:44:51 +02:00
Benoit Marty
11e7ae3c7e Fix compilation error 2021-10-01 14:24:53 +02:00
Benoit Marty
6983e1be55 Split long lines 2021-10-01 14:24:07 +02:00
Benoit Marty
920f467231 Disqble some check, not true anymore 2021-10-01 14:11:26 +02:00
Benoit Marty
ba35c0101e Fix compilation error 2021-10-01 14:09:22 +02:00
Benoit Marty
d1e9f3131a Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing" 2021-10-01 13:31:15 +02:00
Benoit Marty
a1caccbcc8 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "chain-wrapping" 2021-10-01 13:31:15 +02:00
Benoit Marty
2ca3c68611 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Benoit Marty
03bdcee3ad Install ktlint plugin 2021-10-01 13:31:15 +02:00
ganfra
f6b81b36d0 Mavericks 2: switch from MvRxState to MavericksState 2021-10-01 10:08:06 +02:00
ganfra
45509a68bb TextComposer: fix ktlint 2021-10-01 09:43:57 +02:00
SpiritCroc
381010df70 Fix broken bug report when no push gateway is set 
Change-Id: Ie06e3ec56c6ce5f7700fbe186407942849eb504a
 2021-10-01 09:06:43 +02:00
ganfra
2324bf5d05 Mavericks 2: include the libs and make it compile 2021-09-30 19:52:37 +02:00
Adam Brown
a3c4f56774 adding changelog entry 2021-09-30 17:31:23 +01:00
Adam Brown
49e332cb1c formatting 2021-09-30 17:30:23 +01:00
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