mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
10757 commits 6 branches 120 tags 229 MiB
Commit graph

10757 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
3cdf4f9d24 Explicitely specify unifiedpush pusher app id 
We use the upstream pusher_app_id for their sygnal, but we do not need
to do this for unifiedpush, so we can explicitely define the SchildiChat
package here.

Change-Id: Ib56fcde242a584514978ccbdd7e8b337fa7c6529
 2021-08-18 16:21:02 +02:00
SpiritCroc
8215c786b2 Merge branch 'unifiedpush' into sc 
Change-Id: I3de68e2da07d144b2ee82c1ffe1eb6ff535a76f2
 2021-08-18 15:45:22 +02:00
SpiritCroc
6048e12669 Fix reaction color for non-emojis on dark theme 
Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.

Change-Id: I207290a777086db1b27209c4dc34a9810be0a37c
 2021-08-18 15:35:56 +02:00
SpiritCroc
8475f24f17 Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush 
Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58
 2021-08-18 13:16:37 +02:00
SpiritCroc
3b3e39bbb6 Merge branch 'sc' into unifiedpush 
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
 2021-08-18 13:16:19 +02:00
SpiritCroc
b55a83a657 Always update image measures when actual known 
Previuos measures might not what we actually display, e.g. for videos.

Change-Id: I20a80c2ba61d3ca6dd62bde1d5c06d4738553f83
 2021-08-18 12:55:49 +02:00
SpiritCroc
f2f15ed7e4 Add some note to bug reports for SchildiChat 
Change-Id: I2e0360ba041e06bdccfe069b0ea0d62f33afe42f
 2021-08-18 12:33:37 +02:00
SpiritCroc
e2bf0a927d Hide suggestion button again 
Change-Id: I2e9bb7dc8c473b3096c11b24c51e294aea7e4d46
 2021-08-18 12:15:35 +02:00
SpiritCroc
86108b1031 Fix crash when trying to persist expand status with null context 
Change-Id: I4748445f4cf6701e417d137958859157fab72a38
 2021-08-18 12:12:04 +02:00
SpiritCroc
387459ae6b Fix material alert dialog brightening up the desired background color 
Change-Id: I0b805d1605d80765631fdf093ed645b5be35c57b
 2021-08-18 12:07:44 +02:00
S1m
7e258282a2 Change troubleshoot description if using FCM 2021-08-16 18:01:10 +02:00
S1m
c584fa60dd Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-08-16 18:00:33 +02:00
SpiritCroc
3a1cb53c98 Fix some UP crashes 
Change-Id: I16f47f86a58c23210cc99c85081da1703bbda5ac
 2021-08-16 17:02:56 +02:00
SpiritCroc
6a29821273 fastlane: build app bundle 
Change-Id: I6b75272f450dde708dd15b205d9bc2d456340b78
 2021-08-15 14:13:08 +02:00
SpiritCroc
8fe2a0021f Increment version 
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
 2021-08-14 14:38:23 +02:00
SpiritCroc
a59efc0c9f Merge branch 'sc' into unifiedpush 
Change-Id: Id7b4d4d7e5e74cf2e0e13e44f977e1efb0f61044
 2021-08-14 11:14:14 +02:00
Nikita Epifanov
037977a817 Translated using Weblate (Russian) 
Currently translated at 100.0% (89 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
 2021-08-14 10:56:11 +02:00
waclaw66
dd6842e26a Translated using Weblate (Czech) 
Currently translated at 100.0% (89 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-08-14 10:56:11 +02:00
SpiritCroc
ed89f7fb1b Fix composerView having issues with long texts pasted from gboard clipboard 
The pasted text would not properly fill the editText, but show moved up
with empty space below instead.

Change-Id: I82d2a0bafbb402ec0728f21075d4641fbce90890
 2021-08-12 13:50:37 +02:00
SpiritCroc
cf756b8789 Merge branch 'sc' into unifiedpush 
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
 2021-08-12 09:30:41 +02:00
SpiritCroc
2ff3989230 Proper tint for voice message send button 
Change-Id: I25202dea6c794c8dcca3412bca098825b79a01d6
 2021-08-12 09:28:28 +02:00
SpiritCroc
8892248071 Bring back setting to disable voice message recorder button 
Change-Id: I81d647796b82e2034383278da7b169795a092f2e
 2021-08-12 09:22:35 +02:00
SpiritCroc
033c3f7792 Automatic SchildiChat string correction 
Change-Id: Iad534d811812f2a07adbffa4bfc68a73186e3e34
 2021-08-12 09:04:01 +02:00
SpiritCroc
6aba012772 Automatic upstream merge postprocessing 
Change-Id: If4b404091e76ab298085a1151de222f423ce89f7
 2021-08-12 09:04:00 +02:00
SpiritCroc
58f5310e83 Merge tag 'v1.2.0' into sc 
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-12 09:03:42 +02:00
SpiritCroc
6443ae4c7d [TMP] Automatic upstream merge preparation 
Change-Id: I042bcc5e6ed6a00473f32d1270b5b620c69a5691
 2021-08-12 09:02:53 +02:00
SpiritCroc
3e368c56ff Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I84ef9d6b2053914fd11cc202c17562d7f351ade6
 2021-08-12 09:02:52 +02:00
Onuray Sahin
37e722e85d version++ 2021-08-12 02:36:39 +03:00
Onuray Sahin
e0b9fddd18 Merge branch 'release/1.2.0' into develop 2021-08-12 02:33:25 +03:00
Onuray Sahin
4f6b6ddfa8 Merge branch 'release/1.2.0' into main 2021-08-12 02:33:02 +03:00
Onuray Sahin
dfc2460189 Changelog added. 2021-08-12 02:32:54 +03:00
SpiritCroc
38212b6410 Fix some UP crashes 
Change-Id: I16f47f86a58c23210cc99c85081da1703bbda5ac
 2021-08-11 22:45:14 +02:00
Onuray Sahin
d8177c4b5d
Merge pull request #3826 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-08-11 22:12:59 +03:00
SpiritCroc
d1379377b1 Change default unifiedpush gateway 
Change-Id: Ib6b4947295e348283067e3996266f8207bca6440
 2021-08-11 20:56:07 +02:00
Onuray Sahin
e215d964ff Translated using Weblate (Indonesian) 
Currently translated at 45.7% (1174 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-08-11 17:40:26 +00:00
Onuray Sahin
64317c420a
Merge pull request #3824 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-08-11 20:34:57 +03:00
SpiritCroc
5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2021-08-11 18:08:02 +02:00
Weblate
f1ff0a78fc Merge branch 'origin/develop' into Weblate. 2021-08-11 13:46:06 +00:00
Linerly
fdf983a2c8 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-08-11 13:45:40 +00:00
Danial Behzadi
a8c8906934 Translated using Weblate (Persian) 
Currently translated at 48.1% (13 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-11 13:45:40 +00:00
Linerly
35b381e7ea Translated using Weblate (Indonesian) 
Currently translated at 46.0% (1174 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-08-11 13:45:39 +00:00
Danial Behzadi
bb4a45a93d Translated using Weblate (Persian) 
Currently translated at 99.6% (2542 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-08-11 13:45:17 +00:00
Onuray Sahin
8216acfd5c version++ 2021-08-11 16:40:45 +03:00
Onuray Sahin
ba83092ebc
Merge pull request #3818 from vector-im/feature/ons/delabs_voice_message 
Enable voice message by default, remove from labs.
 2021-08-11 16:34:37 +03:00
Onuray Sahin
f6477d5e3b
Merge branch 'develop' into feature/ons/delabs_voice_message 2021-08-11 15:44:14 +03:00
Onuray Sahin
ec093e78b0
Merge pull request #3816 from vector-im/feature/ons/fix_voice_message_ui 
Voice Message - UI Improvements
 2021-08-11 15:42:29 +03:00
Onuray Sahin
a8f4b318c1 Fix tice vibration after cancelling the voice record. 2021-08-11 14:59:21 +03:00
Onuray Sahin
c2401e04b4 Fix collapsing mic and send buttons. 2021-08-11 14:54:29 +03:00
David Langley
a538014935
Merge pull request #3673 from vector-im/feature/dla/reorg_account_notification_settings 
Reorganise Account Notification Settings
 2021-08-11 11:44:17 +01:00
David Langley
45077c69f7 remove NotificationIndex Int index 2021-08-11 09:59:23 +01:00