mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 14:38:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
7525 commits 7 branches 121 tags 229 MiB
Commit graph

2795 commits

Author SHA1 Message Date
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
Benoit Marty
d6ef3ea08e Fix lint issues 2021-01-14 14:08:08 +01:00
Benoit Marty
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound 2021-01-14 10:43:38 +01:00
Benoit Marty
69efb45fb7
Merge pull request #2659 from vector-im/feature/bma/fix_init_sync 
Fix issue with delay set to 0
 2021-01-14 10:41:10 +01:00
Benoit Marty
c88072e55f
Merge branch 'develop' into feature/bma/investigation 2021-01-14 10:38:56 +01:00
Weblate
de73539d2b Merge branch 'origin/develop' into Weblate. 2021-01-13 15:00:03 +00:00
Benoit Marty
7446b12827 Fix request too large Uri error when joining a room 2021-01-12 18:16:35 +01:00
Benoit Marty
2ea45185d4 Ensure the service is restarted with the correct intent 2021-01-12 16:26:52 +01:00
Benoit Marty
50ba131350 More renaming 2021-01-12 16:18:29 +01:00
Benoit Marty
b2df107f17 Remove unused params 2021-01-12 16:11:22 +01:00
Benoit Marty
609ceb7fa4 Avoid Magic numbers 2021-01-12 16:07:49 +01:00
Benoit Marty
aac3f379a7 Add a log 2021-01-12 16:07:49 +01:00
Benoit Marty
ec0a04e893 timeout -> restart without delay 2021-01-12 16:07:49 +01:00
Benoit Marty
8307245120 Fix issue with delay set to 0 2021-01-12 16:07:49 +01:00
Benoit Marty
5431584b3c
Merge pull request #2627 from vector-im/feature/bma/edit_power_level 
Edit power level
 2021-01-12 10:31:17 +01:00
Valere
426782a001 remember groupId in session cache 2021-01-12 09:48:02 +01:00
Valere
7eb9941f8c Code review 2021-01-12 09:14:30 +01:00
SpiritCroc
0049f48148 Also fallback to other user's avatar for 2-person-rooms not marked as DM 
Same behaviour as on desktop.

Change-Id: Ia32fad4f79c0615562b719fcf1013eca4575ee7f
 2021-01-11 11:15:27 +01:00
gkkulik
6d5e1b2285 Added translation using Weblate (Silesian) 2021-01-08 22:30:19 +00:00
Benoit Marty
8de4b0bb20 Small formatting 2021-01-08 15:55:32 +01:00
ganfra
d91ed2985d Sync: fix initial sync is not retried correctly when there is some network error. [#2632] 2021-01-08 12:42:36 +01:00
Benoit Marty
2d91865277
Merge pull request #2624 from vector-im/feature/bma/avoidEventBus2 
Remove dependency to org.greenrobot.eventbus library
 2021-01-08 10:04:38 +01:00
Benoit Marty
2a365d6776 Move interface to correct location 2021-01-07 18:28:05 +01:00
Valere
afa1cf7d6c Cleaning 2021-01-07 11:18:05 +01:00
Benoit Marty
a6f909b942 Add Javadoc 2021-01-07 11:04:11 +01:00
Benoit Marty
ae55ee82a7 Cleanup 2021-01-07 00:07:40 +01:00
Benoit Marty
81bdf506bc Fix Int type issue when sending PowerLevelsContent to the server 2021-01-06 22:53:51 +01:00
Benoit Marty
0702eee179 Improve code 2021-01-06 18:38:06 +01:00
Benoit Marty
22c10f5ada Prefer immutable type 2021-01-06 12:24:47 +01:00
Benoit Marty
963c30a275 Remove dependency to org.greenrobot.eventbus library 2021-01-05 18:56:24 +01:00
Benoit Marty
3a9b80127f Warn user when he is leaving a not public room (#1460) 2021-01-05 11:46:59 +01:00
Valere
4ee34126bd Persist outbound group session 2021-01-05 10:04:34 +01:00
Benoit Marty
c34fea2932 Do not defien Element Stuff in the SDK 2021-01-04 18:16:12 +01:00
Danial Behzadi
83f2ff5d82 Translated using Weblate (Persian) 
Currently translated at 87.7% (193 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fa/
 2021-01-03 12:35:41 +00:00
LinAGKar
594ee61a99 Translated using Weblate (Swedish) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
 2020-12-29 22:35:44 +00:00
zeritti
c85b0124e3 Translated using Weblate (Czech) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-12-29 22:35:44 +00:00
Benoit Marty
3ea3d0fc91 Unspecced msgType field in m.sticker (#2580) 2020-12-29 15:42:12 +01:00
Benoit Marty
7ff45738e0
Merge pull request #2543 from vector-im/feature/ons/wait_members_before_sending_event 
Make sure to load all members in the room before sending the event
 2020-12-29 09:31:30 +01:00
SpiritCroc
cfbe6c753a Refactor misleading "default" 
This used to be the default, but was changed upstream to default
to something similar to our UNREAD_KIND_CONTENT.

Change-Id: Id0e46eebcd3505071f200cafd603fb9828c9a919
 2020-12-28 16:27:01 +01:00
SpiritCroc
0c37405278 Room summary preview / unread kind depending on DMs vs groups 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/32

Change-Id: I4f4e3078e940dc80046d5d08628a1bdbed4fd55e
 2020-12-28 16:17:42 +01:00
Benoit Marty
cc01f25d8f Revert status to RoomMembersLoadStatusType.NONE) in case of failure 2020-12-28 14:52:49 +01:00
Benoit Marty
073e6227d6 Correct Copyright mention 2020-12-28 10:59:50 +01:00
Marcelo Filho
f203fa5c58 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
 2020-12-27 22:35:39 +00:00
Thomas Jensen
c234e12302 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 3.6% (8 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/nb/
 2020-12-24 19:35:58 +00:00
Peter Vágner
7195ee9a69 Translated using Weblate (Slovak) 
Currently translated at 80.0% (176 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sk/
 2020-12-24 19:35:58 +00:00
Thomas Jensen
fa22a4a747 Added translation using Weblate (Norwegian Bokmål) 2020-12-23 14:04:57 +00:00
SpiritCroc
12eb1ea68d Hide empty URL previews 
Change-Id: I10a2f78e7efa96249adb7cd4849e54150a08001a
 2020-12-22 14:26:20 +01:00
Ihor Hordiichuk
c5ce208d07 Translated using Weblate (Ukrainian) 
Currently translated at 35.0% (77 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
 2020-12-22 10:35:59 +00:00
aka. nils on element-translations
e7f7c0ba78 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 28.1% (62 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/nn/
 2020-12-22 10:35:59 +00:00
SpiritCroc
8da4044de6 Merge tag 'v1.0.13' into sc 
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
 2020-12-22 09:24:31 +01:00