filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,186 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

7186 Commits

Author SHA1 Message Date
Benoit Marty a570528f6c More fixes 2020-11-30 10:59:07 +01:00
Benoit Marty 2d4cbde72c Render canonical alias 2020-11-30 10:59:07 +01:00
Benoit Marty f5ae95d7f1 Close form only if necessary 2020-11-30 10:59:07 +01:00
Benoit Marty c5e6e004dd Room alias detail 2020-11-30 10:59:07 +01:00
Benoit Marty d9c209aa87 Cleanup 2020-11-30 10:59:07 +01:00
Benoit Marty 8f80f375f0 Prepare alias bottom sheet 2020-11-30 10:59:07 +01:00
Benoit Marty 2cf2233643 Naming convention 2020-11-30 10:59:07 +01:00
Benoit Marty 36564f0c75 copy/paste error 2020-11-30 10:59:07 +01:00
Benoit Marty 8dbb984ead Sort the aliases 2020-11-30 10:59:07 +01:00
Benoit Marty 74ffbd4679 Ensure the forms are displayable 2020-11-30 10:59:07 +01:00
Benoit Marty 82b23d9a13 Ensure we push only clean m.room.canonical_alias event 2020-11-30 10:59:07 +01:00
Benoit Marty 0a9b234272 Renaming 2020-11-30 10:59:07 +01:00
Benoit Marty 3a06ef3959 Improve form UX + local echo in case of success 2020-11-30 10:59:07 +01:00
Benoit Marty ed4676bb6c Cleanup and avoid duplicate 2020-11-30 10:59:07 +01:00
Benoit Marty 893ebd9690 Fix UI error 2020-11-30 10:59:07 +01:00
Benoit Marty 3c069f8b79 Add published aliases 2020-11-30 10:59:07 +01:00
Benoit Marty 93580c902f Prepare to update canonical alias state 2020-11-30 10:59:07 +01:00
Benoit Marty e1abd5a051 Fix layout issue 2020-11-30 10:59:07 +01:00
Benoit Marty 27fc5f265f Add/Remove local alias (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 5b618ba1f3 Create RoomDirectoryAPI, and handle deletion of alias 2020-11-30 10:59:07 +01:00
Benoit Marty a6f56ace24 Create a dedicated screen to manage room alias (#2428) - WIP 2020-11-30 10:59:07 +01:00
Benoit Marty 0d93105bcd Rended m.room.canonical_alias event in the timeline, considering alt_aliases (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 7c2fea8623 Typo 2020-11-30 10:59:07 +01:00
Benoit Marty e2a89c22da Do not show m.room.aliases event in the timeline (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 03715e0939 Do not use m.room.aliases event to compute a room name (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 4d9b9cb959 Deprecated event m.room.aliases 2020-11-30 10:59:07 +01:00
Benoit Marty d759636d95
Merge pull request #2465 from vector-im/feature/bca/fix_verifypassphrase_bottomsheet 
Fix / double bottomsheet effect
 2020-11-30 10:58:15 +01:00
Benoit Marty c8a8e0f2da Format source 2020-11-30 10:54:22 +01:00
Benoit Marty b004dfbdf2
Merge pull request #2457 from Dominaezzz/suspend_functions_2 
Convert IntegrationManagerService to suspend functions
 2020-11-30 10:49:46 +01:00
Benoit Marty 40ea91cce4
Merge pull request #2459 from Dominaezzz/suspend_functions_3 
Convert UploadsService to suspend functions
 2020-11-30 10:48:44 +01:00
Benoit Marty abcb02d4aa
Merge pull request #2460 from Dominaezzz/suspend_functions 
Convert TermsService to suspend functions
 2020-11-30 10:47:55 +01:00
Benoit Marty cd983de058 Fix cancellation of sending event (#2438) 2020-11-30 10:08:31 +01:00
Benoit Marty f6cc05634f Send task: small rework and cleanup 2020-11-30 10:08:05 +01:00
SpiritCroc 3cb5f6087c Remove empty task affinity 
By default, all activities of the app share the same task affinity. By
setting it to "" for this activity, on launch the splash screen and the
home activity are launched as two separate tasks (tested on Android 11).

Change-Id: I60e3791017b6c33288d152cf97c5af04ae8979eb
 2020-11-29 18:27:37 +01:00
SpiritCroc 50b357642f Add back gradle checksum 
Change-Id: I88c997635b13164f44d473ae026a2bd1e6fe35fa
 2020-11-29 16:02:42 +01:00
SpiritCroc 6d1cb06373 Bubble style none = else 
Change-Id: I910075b871f55968685f109ac3f729e42be1b384
 2020-11-29 15:51:19 +01:00
SpiritCroc de8bd1d605 View stub minimum width: read from informationData 
Change-Id: If0ea41028044750ff540dc6a1bee2d1143715321
 2020-11-29 15:45:24 +01:00
SpiritCroc 4b5aab3c8d Show "more" again in case topic is shown in easy mode 
Change-Id: Ib5e93fd0b471746dc3fb58be581f35b0ff28c64b
 2020-11-29 14:56:51 +01:00
SpiritCroc 6830ffd3f0 Easy mode: Hide encryption status and action in room profile 
Change-Id: Ia12cd69a5c4cad5577049020478987fb588932a1
 2020-11-29 13:31:41 +01:00
SpiritCroc f23bea23e5 Fix compile after v1.0.11 merge 
Change-Id: I122e4d98b464606c25c837d6d28e32a2c9f08c72
 2020-11-29 13:15:47 +01:00
SpiritCroc 86e638428b Revert "Revert "Resolve required manual intervention in german strings"" 
This reverts commit 77df970e1b.

Change-Id: Idbb71587c4e54a53cf9890416376444e7c8b5907
 2020-11-29 12:57:03 +01:00
SpiritCroc 4afb6aa469 Automatic SchildiChat string correction 
Change-Id: I4a542ccc442ce0ec5a2bde5daf8c612342b8410d
 2020-11-29 12:52:26 +01:00
SpiritCroc 0469beab1c Automatic upstream merge postprocessing 
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
 2020-11-29 12:52:25 +01:00
SpiritCroc e0ca1f2751 Automatic color correction 
Change-Id: Ia5d7d0bcba99005bb81a16a02edcc18b2480db1c
 2020-11-29 12:52:25 +01:00
SpiritCroc 6f0a1acaf7 post_merge.sh: Add some automatic accent color correction 
Change-Id: Ie0cf3b2d89fa8b24ac7544cba2f1540be041674b
 2020-11-29 12:52:07 +01:00
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
SpiritCroc b283ba3b0a [TMP] Automatic upstream merge preparation 
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
 2020-11-29 12:32:30 +01:00
SpiritCroc 857ebde8ba Revert "Automatic SchildiChat string correction" 
This reverts commit 5a4907362a.
 2020-11-29 12:32:30 +01:00
SpiritCroc 77df970e1b Revert "Resolve required manual intervention in german strings" 
This reverts commit 2590f8f690.
 2020-11-29 12:32:30 +01:00
Marcelo Filho f14b390849 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2020-11-28 17:50:18 +00:00