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

7150 commits

Author SHA1 Message Date
SpiritCroc
c38ece586e Increment version 
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
 2021-09-13 16:20:06 +02:00
SpiritCroc
ddceeaff0d Automatic SchildiChat string correction 
Change-Id: I9447b4a54567537195c0bf814e8d001a438ccd2f
 2021-09-13 15:37:58 +02:00
SpiritCroc
741ac9f3f6 Merge tag 'v1.2.2' into sc 
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
 2021-09-13 15:37:54 +02:00
Benoit Marty
cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +02:00
SpiritCroc
70b8b3a22f Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I831bc3b9509ded5c8bea671810a2c067e8c1f984
 2021-09-13 14:18:47 +02:00
SpiritCroc
4f1cde6c07 Add some secret setting 
Change-Id: I8f43d720c556389555128da07e8c6571afea13c3
 2021-09-11 11:16:37 +02:00
SpiritCroc
8a8ad86806 Drawer notif count badge: use total count 
Upstream decided to only count notifications for other spaces than the
currently selected one for the drawer icon. This however leads to
notification counts multiplying for rooms present in multiple spaces.
Instead, it's more useful to just show the total notification count,
without doing any kind of space-based filtering.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/79

Change-Id: I2a76d4fbc768b36470d9183741f57a5f834d374a
 2021-09-11 10:22:23 +02:00
SpiritCroc
75a9c748af Hide secure backup "backing up keys" banner 
Change-Id: I432561ac30d70509c38e07e8ed3ea4cecb9fe4b2
 2021-09-11 10:00:46 +02:00
SpiritCroc
9d25264a19 Merge remote-tracking branch 'p1gp1g/unifiedpush' into sc 
Change-Id: I3c3bd1405fad1eba0974e65f089dcbdd4c152671
 2021-09-11 09:41:59 +02:00
SpiritCroc
1b8874e8cb Expose and theme some upstream colors concerning video conferences 
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
 2021-09-10 12:26:56 +02:00
SpiritCroc
3be0b85dcf Actually, this is 1.2.1 now 
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
 2021-09-09 16:21:19 +02:00
SpiritCroc
d9db4fffb2 Make new notification mode radio items look nicer 
Change-Id: I5ce2373a7b855da74d4a29f595171644bb3d5ae0
 2021-09-09 14:30:26 +02:00
SpiritCroc
4b241a00a3 Refactor power-level based display name color updates 
Use similar mechanism as recently added for isDirect changes.

Change-Id: Ida304ae2cc2fbe85cc4b47cb32d6c343cd5e2bd6
 2021-09-09 12:48:41 +02:00
SpiritCroc
f4d8f78ac7 Fix timeline rebuild on DM state change 
Needs slightly different handling after
50a042683b "Architecture: get rid of RoomSummariesHolder as it can lead to errors"

Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
 2021-09-09 12:12:31 +02:00
SpiritCroc
ca40676070 Automatic SchildiChat string correction 
Change-Id: Ie159d8065491758645b608d097daee74e61d1000
 2021-09-09 10:59:34 +02:00
SpiritCroc
11093ee015 Add back unifiedpush strings, but to SC strings 
Change-Id: Idea333c040aaf761d080e2ca15f463549da94efa
 2021-09-09 10:55:42 +02:00
SpiritCroc
133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
SpiritCroc
99ada07157 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ibfce6aea9c9404a43e9adc6de365626ad4d43e5e
 2021-09-09 09:41:38 +02:00
SpiritCroc
832f0e0e5b Increment version 
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
 2021-09-09 09:39:24 +02:00
Benoit Marty
fcd72fd9e3
Merge pull request #3991 from vector-im/feature/fga/fix_memory_leak_room_detail 
Fix memory leak on RoomDetailFragment
 2021-09-08 17:28:26 +02:00
ganfra
3119de42fb Fix memory leak on RoomDetailFragment 2021-09-08 16:47:53 +02:00
Weblate
5e9be4860d Merge branch 'origin/develop' into Weblate. 2021-09-08 13:44:59 +00:00
Le Dang Trung
f1fe9d83fe Translated using Weblate (Vietnamese) 
Currently translated at 34.9% (914 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-09-08 13:44:35 +00:00
Ihor Hordiichuk
081206db1c Translated using Weblate (Ukrainian) 
Currently translated at 81.3% (2126 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-08 13:44:18 +00:00
Niels Bouma
efe03ec681 Translated using Weblate (Dutch) 
Currently translated at 51.4% (1345 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-09-08 13:44:12 +00:00
Fjoerfoks
7baf407e13 Translated using Weblate (Frisian) 
Currently translated at 33.8% (884 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-09-08 13:44:09 +00:00
waclaw66
0f5007f0ba Translated using Weblate (Czech) 
Currently translated at 100.0% (2615 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-09-08 13:44:07 +00:00
Onuray Sahin
1df867f345 Fix rendering voice message if the waveform data is corrupted. 2021-09-08 13:20:56 +03:00
Niels Bouma
ad81164b38 Translated using Weblate (Dutch) 
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
 2021-09-07 15:06:18 +02:00
Ihor Hordiichuk
a139eb71e1 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:04:31 +00:00
strix aluco
ce5a45ea31 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:04:31 +00:00
Ihor Hordiichuk
a9f345b694 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:02:30 +00:00
strix aluco
18ddf649ba Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:02:03 +00:00
Florian Renaud
e78aec5fcc Room details: Check power level before showing add people button 2021-09-07 11:42:40 +02:00
Florian Renaud
24e2f1a8e0 Room details: Check power level before showing topic hint 2021-09-07 11:42:40 +02:00
Benoit Marty
e1f7ab8669
Merge pull request #3965 from cketti/improve_sharing 
Use ShareCompat.IntentBuilder for sharing images
 2021-09-06 10:07:37 +02:00
cketti
0aff0c1f20 Use ShareCompat.IntentBuilder for sharing images 
ShareCompat does the right things so image previews show up in the Share sheet of Android 11.
 2021-09-04 00:50:30 +02:00
Benoit Marty
a76aedbbc7 Fix clicking on edited message 2021-09-03 17:02:14 +02:00
Benoit Marty
2b1c517f64 Fix test broken sometimes, and test new bottom sheet about room type 2021-09-03 17:02:14 +02:00
Benoit Marty
01dae575de Fix sanity test with new notification V2 screens 2021-09-03 17:02:14 +02:00
Benoit Marty
73881d0813 Upgrade dependency on Barista. 
Should fix #3929

Barista has changed location since 4.0.0
 2021-09-03 17:02:14 +02:00
Benoit Marty
fc22376050 Ignore warning in test. 
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
 2021-09-03 17:02:14 +02:00
Benoit Marty
dbd11c2e8d Remove the useless merge tag 
It was causing crash with `Missing required view with ID: im.vector.app.debug:id/waiting_view`, probably due to a recent change in AGP 7.X.X
 2021-09-03 16:21:55 +02:00
Benoit Marty
377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2 
Bump gradle from 4.2.2 to 7.0.2
 2021-09-03 12:11:52 +02:00
Valere
9687a59371 Code review 2021-09-02 11:34:08 +02:00
Valere
acf7a226f0 Fix / summary showing roomIds instead of names 2021-09-02 11:34:08 +02:00
Valere
c01b36a648 Support summary pagination API in manage space 2021-09-02 11:34:08 +02:00
Valere
5297512f87 Support Space explore pagination 2021-09-02 11:34:08 +02:00
Benoit Marty
ec6bae6b1e Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now 
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
 2021-09-02 10:43:33 +02:00
Benoit Marty
80f23f1f3c Use Java 11 source code 
https://developer.android.com/studio/releases/gradle-plugin#java-11
 2021-09-02 09:50:34 +02:00