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

8030 commits

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
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
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
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
Weblate
e279ffa1d8 Merge branch 'origin/develop' into Weblate. 2021-11-17 09:59:36 +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
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
SpiritCroc
7aec888940 Bring back notices for kicks 
Change-Id: I8bac582658fc2e2b0829c4ee15e251f88d972d80
 2021-11-16 16:09:32 +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
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
Noômen Ben Hassin
60c50e23a1 Added translation using Weblate (English (Old)) 2021-11-15 18:30:17 +00:00
SpiritCroc
4248ec163f Fix detection of some emojis for emoji-only messages 
Change-Id: Ie22d90c39091a85736260672db7413fdfd45f7c4
 2021-11-15 18:04:55 +01:00
SpiritCroc
1bd59e3c1c When scrolled to the bottom, stick there 
Change-Id: I0c788368afef04d7541f633cd830f5bdbf665049
 2021-11-15 18:03:22 +01:00
SpiritCroc
3f448b48c7 Prefer staying scrolled to the bottom while composer is open 
Change-Id: I962ce6850c0bb7e62b81f5620d56442afb7245f4
 2021-11-15 18:02:58 +01:00
Benoit Marty
6f13fb1634 Create file for Toast style (more generic) 
And improve fragment_create_poll.xml preview rendering
 2021-11-15 14:23:32 +01:00
Benoit Marty
223b33fa65 Create CallToAction button style 2021-11-15 14:16:22 +01:00
Benoit Marty
2aab94acb4 Create dedicated file for TextInputLayout styles 
And follow naming convention
 2021-11-15 14:11:15 +01:00
Benoit Marty
35e2a1083b
Merge pull request #4360 from vector-im/feature/ons/poll 
Poll Feature - Create
 2021-11-15 14:05:40 +01:00
Benoit Marty
df60b0c2b7
Merge pull request #4430 from vector-im/feature/adm/feature-notification-images 
Notification images
 2021-11-15 12:46:51 +01:00
Onuray Sahin
299d81fd18 Lint fix. 2021-11-15 14:41:22 +03:00
Benoit Marty
fb8b720a3b Add comment to run on Android 12 2021-11-15 12:25:42 +01:00
Benoit Marty
5a19533b4a Use correct value, but I do not see any effect on emulator with API 12 2021-11-15 12:25:42 +01:00
Benoit Marty
60d75ff8e2 Fix crash on Android 12. 
I guess we accept only images coming from the keyboard.
 2021-11-15 12:25:42 +01:00
Benoit Marty
96de0f86fe Fix lint issue "NullSafeMutableLiveData" 
LiveData value assignment nullability mismatch
 2021-11-15 12:25:42 +01:00
Benoit Marty
1082771f7c Fix lint issue "Incorrect constant" 2021-11-15 12:24:48 +01:00
Benoit Marty
03019fdfd9 Fix lint issue "Outside Range" 
Ensure that column index is not -1
 2021-11-15 12:24:48 +01:00