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

2603 Commits

Author SHA1 Message Date
SpiritCroc 3fb2df76c2 Possibility to mark rooms as unread 
Using com.famedly.marked_unnread, as per MSC2867
(https://github.com/matrix-org/matrix-doc/pull/2867)

TODO:
- Currently, when upgrading from an older version, already existing
  unread flags are ignored until cache is cleared manually

Change-Id: I3b66fadb134c96f0eb428afd673035d790c16340
 2020-12-05 14:27:26 +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
Benoit Marty bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto 
Fix issues with matrix.to deep linking
 2020-11-27 10:22:51 +01:00
Weblate d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
Valere 4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms 
Fix / update profile when no rooms
 2020-11-26 15:09:40 +01:00
Valere 67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab 
Feature/bca/quick invite dm tab
 2020-11-26 14:58:14 +01:00
Valere fbc3f47eeb Fix / update profile when no rooms 2020-11-26 14:34:45 +01:00
Valere 8e6e6736a3 Code review 2020-11-26 09:09:27 +01:00
notramo d2398a7abb Translated using Weblate (Hungarian) 
Currently translated at 83.1% (158 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
 2020-11-25 08:50:03 +00:00
Valere 1f69c7e992 Better e2e log reporting 2020-11-20 17:37:20 +01:00
Benoit Marty b888d13e62 Use orEmpty() 2020-11-20 14:50:21 +01:00
Benoit Marty 1070c23608 QR code invite flow support - invite friends 
Author: Valere
 2020-11-20 14:50:21 +01:00
Benoit Marty 5b278f704c
Merge pull request #2427 from vector-im/feature/bma/dominaezz_cleanup 
Feature/bma/dominaezz cleanup
 2020-11-20 14:11:53 +01:00
Benoit Marty 85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form 2020-11-20 13:57:35 +01:00
Benoit Marty 41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test 
Feature/bma/sanity test
 2020-11-20 13:56:49 +01:00
Benoit Marty 9ce1222fd0 Kotlin optimization form #1435 2020-11-20 09:07:29 +01:00
Benoit Marty 8fb3c68573 Kotlin optimization form #1435 2020-11-20 09:05:53 +01:00
Benoit Marty eb7ee49096 Kotlin optimization form #1435 2020-11-20 09:04:04 +01:00
Benoit Marty 5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-19 17:02:35 +01:00
Benoit Marty 0046fe25c5
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-19 17:00:49 +01:00
Benoit Marty fdb13f0b77
Merge pull request #2385 from vector-im/feature/bma/fdroid_60_timeout 
F-Droid version: ensure timeout of sync request can be more than 60 s…
 2020-11-19 16:59:40 +01:00
Benoit Marty d5f83acaf5
Merge pull request #2414 from Dominaezzz/suspend_functions_2 
Convert PushRuleService to suspend functions
 2020-11-19 15:32:01 +01:00
Benoit Marty 4df68479ac
Merge pull request #2369 from vector-im/feature/bca/quick_invite_room_tile 
EmptyRoom tile with quick actions
 2020-11-19 09:46:25 +01:00
Benoit Marty 3ec25f3634
Merge pull request #2413 from Dominaezzz/suspend_functions 
Convert Group to suspend functions
 2020-11-19 02:05:06 +01:00
Benoit Marty 1eac90e5b1 Use plurals for proper i18n 2020-11-18 18:13:49 +01:00
Valere 206e68b1d2 Unused val 2020-11-18 18:13:49 +01:00
Valere 1de5cd2e61 Code review 2020-11-18 18:13:49 +01:00
Valere 264bc52bcc WIP review 2020-11-18 18:13:49 +01:00
Valere 2626a761ea EmptyRoom tile with quick actions 2020-11-18 18:13:49 +01:00
Dominic Fischer 1359c6be1d Missed a spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 15:40:22 +00:00
Benoit Marty ca0da2c509
Merge pull request #2405 from Dominaezzz/suspend_functions_1 
Convert DraftService to suspend functions
 2020-11-18 16:00:33 +01:00
Dominic Fischer 92a6e9ea5a Remove redundant return 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:23:59 +00:00
Dominic Fischer 822ce41b54 Remove redundant return 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:22:07 +00:00
Benoit Marty 514263ae12 Room creation Fragment: no more "Retry" action, loading and error displayed in a dialog 2020-11-18 14:51:10 +01:00
Benoit Marty af8b400bf4 Room creation form: input an alias for public room (#1314) 2020-11-18 13:44:55 +01:00
Dominic Fischer a32d7f78bb Convert SearchService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:23:40 +00:00
Dominic Fischer 94b135ae95 Convert PushRuleService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:19:58 +00:00
Dominic Fischer e42cad68b4 Convert Group to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:16:53 +00:00
Rintan 8a44ee9d50 Translated using Weblate (Japanese) 
Currently translated at 42.6% (81 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ja/
 2020-11-18 09:50:01 +00:00
Victor Cuadrado Juan 14bf0038a9 Translated using Weblate (Spanish) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/es/
 2020-11-16 23:50:03 +00:00
Benoit Marty 579efb016a Room creation form: add advanced section to disable federation (#1314) 2020-11-16 18:02:18 +01:00
Dominic Fischer 3d970737d1 Remove redundant return 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 14:45:42 +00:00
Dominic Fischer 0a318f618b Convert RawService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 13:48:19 +00:00
Dominic Fischer 574d5055bd Convert DraftService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 13:46:24 +00:00
Benoit Marty 4c6996bc09
Merge branch 'develop' into feature/bma/consent 2020-11-16 13:43:02 +01:00
Benoit Marty 6ff12b3a88
Merge pull request #2402 from Dominaezzz/suspend_functions_1 
Convert ReportingService to suspend functions
 2020-11-16 13:39:47 +01:00
Dominic Fischer d67029c42c Convert ReportingService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 11:47:18 +00:00
Dominic Fischer 4dff9316c2 Convert TagsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 11:44:30 +00:00
Danial Behzadi 032d46d8e6 Translated using Weblate (Persian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fa/
 2020-11-14 16:50:02 +00:00
Benoit Marty 64c612dea0 F-Droid version: ensure timeout of sync request can be more than 60 seconds (#2169) 2020-11-13 19:14:50 +01:00