Commit graph

812 commits

Author SHA1 Message Date
Valere
bd88d85a21
Merge branch 'develop' into feature/fix_441 2019-08-27 04:35:17 -04:00
Valere
704da1be55
Merge branch 'develop' into feature/fix_358 2019-08-27 04:34:24 -04:00
Valere
d4161e9a1a Fix text diff removed linebreak 2019-08-27 10:17:42 +02:00
Valere
7966ebef03 Date change message repeats for each redaction until a normal message 2019-08-27 10:16:11 +02:00
Valere
ed5faca5d2 Slide-in reply icon is distorted 2019-08-27 10:06:20 +02:00
ganfra
51a4c93676 Read markers: continue working on ui 2019-08-23 16:54:32 +02:00
ganfra
d8f449388c Read marker: start working on it (no UI) 2019-08-20 18:30:24 +02:00
Benoit Marty
8ca829d538 An error was displayed by mistake 2019-08-19 17:22:04 +02:00
ganfra
5402902bc2 Merge branch 'develop' into feature/di_clean 2019-08-19 15:04:26 +02:00
ganfra
bc1350aaf5
Merge pull request #484 from vector-im/feature/timeline_read_receipts
Feature/timeline read receipts
2019-08-19 14:29:59 +02:00
ganfra
fd74e3dfb1 Read receipts: clean code after review 2019-08-19 14:08:15 +02:00
ganfra
e0628da1cb Dagger: use AssistedInjectModule for viewModel + use AssistedFactory for room dependencies 2019-08-14 19:09:56 +02:00
Benoit Marty
aa4e74e986
Merge pull request #487 from vector-im/feature/fix_ui_issues
Feature/fix ui issues
2019-08-14 18:20:08 +02:00
ganfra
501474b720 Fix code quality issues 2019-08-14 14:53:40 +02:00
ganfra
e11c66035c Theme: the action menu text items should use colorAccent 2019-08-14 14:19:21 +02:00
ganfra
3d2d219d79 Room list: let the fab animation be quicker 2019-08-14 14:18:56 +02:00
ganfra
63af03bedd List: add overScroll 2019-08-14 14:18:42 +02:00
ganfra
d3827b8673 Read receipts: branch settings to show/hide them 2019-08-14 10:51:09 +02:00
Benoit Marty
4ca2531e47 develop branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode
Other branches (master, features, etc.) will have version code based on application version.
2019-08-14 10:45:17 +02:00
ganfra
25a4240a5a Merge branch 'develop' into feature/timeline_read_receipts 2019-08-13 15:16:10 +02:00
ganfra
b9cfda23b6 Read receipts: just juste invisible on hidden avatars, to have a bigger touch zone 2019-08-13 15:06:00 +02:00
ganfra
21deb2551d Read receipts: handle read receipts set on filtered events + let BottomSheet takes a snapshot instead of being live. 2019-08-12 17:59:07 +02:00
ganfra
70639f180c Read receipts: add read receipts bottom sheet 2019-08-08 19:59:20 +02:00
ganfra
1dbb02a80d Read receipts: create custom view to use it wherever we want easily 2019-08-08 17:51:06 +02:00
ganfra
825463d9cd Change package for NotificationAreaView 2019-08-08 17:50:33 +02:00
Benoit Marty
3f792c7a84 Automatic "-dev" version suffix on non master branch 2019-08-08 16:57:03 +02:00
Benoit Marty
347dcb469a Version++ 2019-08-08 16:47:13 +02:00
Benoit Marty
e216cd15a8 Prepare release 0.3.0 2019-08-08 16:44:53 +02:00
Benoit Marty
f7b471f141 Stop using BuildConfig.VERSION_CODE, it is not the correct value 2019-08-08 16:31:45 +02:00
Benoit Marty
93fd56a7ca Ensure versionCode is the wanted one for GPlay and F-Droid build 2019-08-08 16:30:44 +02:00
ganfra
b4ce8748cb First step in handling read receipts 2019-08-08 14:32:11 +02:00
Benoit Marty
9d5433a857 Show sync progress also in room detail screen (#403) 2019-08-08 14:14:10 +02:00
Benoit Marty
6e44cca17d Handle /markdown command 2019-08-08 12:09:05 +02:00
Benoit Marty
0a73887c70 Daggerization of VectorPreferences 2019-08-08 11:52:50 +02:00
Benoit Marty
24f391dac0
Merge pull request #467 from vector-im/feature/playstore_crash
Feature/playstore crash
2019-08-07 17:10:49 +02:00
Benoit Marty
81c7f694d6 Import Strings form Riot 2019-08-07 16:10:50 +02:00
Benoit Marty
3584658c36 Fix crash (IllegalStateException) observed on PlayStore 2019-08-07 13:24:43 +02:00
Benoit Marty
12a0cbb400 Fix crash observed on PlayStore 2019-08-07 13:16:04 +02:00
Benoit Marty
20437446b4 Add "View Edit History" item in the message bottom sheet (#401) 2019-08-07 13:05:22 +02:00
Benoit Marty
35229882e3 Fix (edited) link can be copied to clipboard (#402) 2019-08-07 12:28:21 +02:00
Benoit Marty
63f6081fa5 Split APK: generate one APK per arch, to reduce APK size of about 30% 2019-08-07 11:46:38 +02:00
Benoit Marty
ee2e575211 Display VersionCode of the app in the settings, because Android system does not display it anymore 2019-08-07 11:44:51 +02:00
ganfra
b79fdf6a85 Fix theme not well defined at runtime after configurationChange 2019-08-06 18:55:38 +02:00
Benoit Marty
7b5dff3dcf Mutualize :? part 2019-08-06 18:14:24 +02:00
Benoit Marty
bb04af1e2c Remove useless code 2019-08-06 18:14:24 +02:00
Benoit Marty
2f94fbd7eb Use existing method 2019-08-06 18:14:24 +02:00
Benoit Marty
f2a3bdb68e Kotlin style 2019-08-06 18:14:24 +02:00
Benoit Marty
097e9714ff Cleaner code 2019-08-06 18:14:24 +02:00
Benoit Marty
99f4196388 More code cleanup/review 2019-08-06 18:14:24 +02:00
Benoit Marty
394b89e76b Avoid duplicated code 2019-08-06 18:07:35 +02:00
Benoit Marty
0db8e7da43 Format 2019-08-06 18:07:35 +02:00
Valere
85499c6b33 fix for background overlaps 2019-08-02 10:00:33 +02:00
Valere
8076eab4b5 Fix / Shared element transition overlap
Shared element was overlapping top system bars
2019-08-02 10:00:33 +02:00
Valere
d47c0f5ebc Fix / layout res in debug instead of main 2019-08-02 09:59:59 +02:00
ganfra
77c4355aed Merge branch 'develop' into feature/room_update 2019-07-31 14:27:12 +02:00
ganfra
1a92562182 Clean code after review 2019-07-31 14:06:10 +02:00
ganfra
eb446d7b49 Fix code quality issues 2019-07-30 21:20:30 +02:00
ganfra
dc4786ecf0 Room upgrade: add rx flux and handle failures more precisely 2019-07-30 19:13:09 +02:00
Valere
000db4b192 Basic Message Failure support + Resend (text only)
+ clean worker inputs when starting new independent task in unique queue
2019-07-30 17:53:43 +02:00
ganfra
f4df27c2dc Merge branch 'develop' into feature/room_update 2019-07-30 15:51:56 +02:00
ganfra
ab25980c4e
Merge pull request #437 from vector-im/feature/create_direct_room
Feature/create direct room
2019-07-30 15:13:30 +02:00
ganfra
6deba31111 Direct room: finally use PagedList as we can get a lot of users in DB. 2019-07-30 14:51:14 +02:00
ganfra
ff6ce8a4b7 Create direct : remove letter headers when filtering 2019-07-29 19:13:06 +02:00
ganfra
65f0af918f Remove default identity server as we don't use it. 2019-07-29 18:26:26 +02:00
ganfra
ac38a6461c Tombstone : handle joining viaserver params 2019-07-26 19:17:12 +02:00
ganfra
9a1e16a170 Tombstone : add notification area and handle links 2019-07-26 14:51:14 +02:00
ganfra
9e5c70dda3 Room update: start handling tombstone and room create events [WIP] 2019-07-25 19:34:39 +02:00
ganfra
76a9625f25 Direct chat : finalize flow 2019-07-25 16:34:27 +02:00
ganfra
5af6bf3762 Direct room: finally handle selection with chips (not as Nad design) 2019-07-25 16:34:27 +02:00
ganfra
125eacb20b Direct messages: try to handle selecting/deselecting users (WIP) 2019-07-23 19:53:47 +02:00
Valere
3aea0a50ca
Merge branch 'develop' into feature/pending_edits_ux 2019-07-22 23:53:16 +02:00
Valere
ab87a3caea
Merge pull request #397 from vector-im/feature/animation_image_preview
Better image fullscreen preview animation
2019-07-22 23:37:15 +02:00
Valere
c58328f94e cleaning / review 2019-07-22 23:36:19 +02:00
ganfra
03974c8bdf Create Direct Room : fix loading/error state (WIP) 2019-07-22 19:01:17 +02:00
ganfra
2c81e41288 Merge branch 'develop' into feature/create_direct_room 2019-07-19 18:18:22 +02:00
ganfra
cb44ab547c Create direct room: almost finished, still need to handle showing selected users in search field 2019-07-19 18:12:42 +02:00
Benoit Marty
6d01a570fd Clear notification for a room left on another client 2019-07-19 16:44:30 +02:00
Valere
4a2bf0d6c6 Cleaning Lint 2019-07-19 16:18:47 +02:00
Valere
36af8a6a9f Lab / show replace in timeline when show hidden event selected 2019-07-19 16:13:55 +02:00
Valere
40a68c3e9f Show pending edits by fading the event body #193
+ Fix issues with edits local echo management in aggregation
2019-07-19 16:13:35 +02:00
Benoit Marty
1a4ec34bb2 Code cleanup 2019-07-19 16:03:37 +02:00
Benoit Marty
10490e3aa6 Close detail room screen when the room is left with another client (#256) 2019-07-19 16:00:06 +02:00
Benoit Marty
cd6624a8a6 Fix issue on setting screen: bad alignment of title 2019-07-19 15:15:29 +02:00
Valere
3965218bf9 Cleaning / Review 2019-07-19 12:12:17 +02:00
Valere
d78ff7ab08 Fix / can't zoom after rotation 2019-07-19 11:58:24 +02:00
Valere
c00dbce536 Fix #390
(edited) string in edited message body
2019-07-19 09:58:53 +02:00
Valere
db88caf7fa Better image fullscreen preview animation 2019-07-18 18:53:46 +02:00
Benoit Marty
c3d945d6bb Version++ 2019-07-18 17:48:56 +02:00
Benoit Marty
d609c49b31 Prepare release 0.2.0 2019-07-18 17:47:24 +02:00
ganfra
001603cf9a Create direct room: add filtering and enhance design a bit 2019-07-18 17:42:22 +02:00
Valere
d87ee32422
Merge pull request #384 from vector-im/feature/edit_e2e
Feature/edit e2e
2019-07-18 16:44:44 +02:00
Benoit Marty
f0671b9e73 "Riot X" -> "RiotX" 2019-07-18 14:28:46 +02:00
Benoit Marty
e218691bf2 Import strings and translation from Riot 2019-07-18 14:25:34 +02:00
Valere
9c67036c08 Fix / keyboard won't show when using reply from long tap menu 2019-07-18 12:13:17 +02:00
ganfra
62657538af
Merge pull request #389 from vector-im/feature/cleanup
Do not show invitation in the filtered room list
2019-07-18 12:10:47 +02:00
Valere
5438207fba faster animation for quick reply 2019-07-18 12:01:23 +02:00
Benoit Marty
fe88aaffbd Inject RoomListNameFilter 2019-07-18 11:39:13 +02:00
Benoit Marty
21ba72e5e7 Do not show invitation in the filtered room list 2019-07-18 11:34:49 +02:00
Benoit Marty
0afde3b021 Rename class member for code clarity 2019-07-18 11:07:09 +02:00
ganfra
4341b0d0f5 Merge branch 'develop' into feature/create_direct_room 2019-07-18 09:47:25 +02:00
Valere
51fdccb393 cleaning 2019-07-18 09:29:27 +02:00
Benoit Marty
977721881f Cancel invitation notification when handling the invitation in the application 2019-07-17 18:35:41 +02:00
ganfra
838003b68a Create direct room: start creating all the required stuff 2019-07-17 18:30:14 +02:00
Valere
7d41352918 Fix / edit reply was quoting wrong text
+ e2e reply of edit
2019-07-17 16:46:56 +02:00
Valere
077396a832 E2E replies
+ Edit History / support e2e and use original event
2019-07-17 16:20:12 +02:00
Benoit Marty
fc9ef579ca
Merge pull request #381 from vector-im/feature/room_members_perf
Feature/room members perf
2019-07-17 15:01:06 +02:00
Benoit Marty
77fa5af1b8 Fix compilation issue after merge 2019-07-17 14:58:23 +02:00
Benoit Marty
90d25ff45e Code cleanup 2019-07-17 14:41:01 +02:00
Valere
22dc2a6790 Fix Copying link from a message shouldn't open context menu 2019-07-17 14:36:47 +02:00
Benoit Marty
927cd7285d
Merge pull request #378 from vector-im/feature/fix_sync_thread_wrong_autostart
Fix / SyncThread was started in background
2019-07-17 14:32:19 +02:00
Benoit Marty
0be987ac0d
Merge branch 'develop' into feature/better_long_tap_menu 2019-07-17 14:28:36 +02:00
Valere
4bfaa00be4 Fix / clean bad method name 2019-07-17 14:27:02 +02:00
Benoit Marty
8e78d8a58d
Merge pull request #380 from vector-im/feature/rs_crash_steve
Fix a crash in notificationwhen display name is empty
2019-07-17 14:22:45 +02:00
Benoit Marty
e3e86c0a41
Merge pull request #383 from vector-im/feature/filter_params
Pass filter to room directory screen or create room screen
2019-07-17 14:20:29 +02:00
Benoit Marty
0ddef67cc9 Migrate to rxbinding 3 and fix bad layout for room directory filter (Fixes #349) 2019-07-17 14:16:20 +02:00
Benoit Marty
896e582a9c Create style VectorSearchView 2019-07-17 14:16:20 +02:00
Benoit Marty
c647648e79
Merge pull request #371 from vector-im/feature/composer_fix_edit_reply
Feature/composer fix edit reply
2019-07-17 14:03:10 +02:00
Benoit Marty
b654025a3b Fix alignment issue in toolbars 2019-07-17 12:38:35 +02:00
Benoit Marty
786a7d7560 Rename id 2019-07-17 12:20:11 +02:00
Benoit Marty
b935b9311e Scroll the list to top after each new filter 2019-07-17 12:18:45 +02:00
Benoit Marty
8e12f71535 Add top left back button 2019-07-17 12:16:10 +02:00
Benoit Marty
7eea2ccfb4 Fix infinite opening of room once the room is created 2019-07-17 12:09:09 +02:00
Benoit Marty
c32ef02a12 Pre fill the room directory filter and and the room name with the already entered string from the user 2019-07-17 12:04:19 +02:00
Benoit Marty
3651ec4870 Add some doc 2019-07-17 11:58:18 +02:00
Valere
9494174c33 Swipe to reply in timeline (lab) 2019-07-17 10:54:15 +02:00
ganfra
a8f06f609b Use latest retrofit version to properly cancel requests
Fix cancelation requests
2019-07-16 17:46:52 +02:00
Valere
9bdea5b325 Change order of actions (and reply on top) 2019-07-16 16:35:57 +02:00
Valere
2f01ad99b3 Compact long tap menu 2019-07-16 16:35:36 +02:00
Benoit Marty
bb3b5788ba Update hint from design 2019-07-16 16:35:10 +02:00
Benoit Marty
0f7a56d005 Use Session.myUserId whereas it's possible 2019-07-16 15:54:00 +02:00
Valere
63d2861bc8 Fix / SyncThread was started in background
Upon reception of a push, is the session is instantiated the sync thread was starting to loop
2019-07-16 15:44:08 +02:00
Benoit Marty
6bbc784c29 Fix crash (from Steve's rageshake) 2019-07-16 15:42:02 +02:00
Valere
c6fd625761 code review 2019-07-16 14:56:16 +02:00
Valere
d8092abc4e fix / strip reply prefix on history 2019-07-16 14:39:46 +02:00
Valere
6effb90361 Fix / edit of reply and edit of edit of reply 2019-07-16 14:39:05 +02:00
Benoit Marty
42584fc55a
Merge pull request #372 from vector-im/feature/room_filtering
Room filtering
2019-07-16 11:41:08 +02:00
Valere
020c32bb1a Fix / composer separator color was using a clear theme color 2019-07-15 17:46:24 +02:00
Benoit Marty
efd973208f Green close icon 2019-07-15 17:35:51 +02:00
Benoit Marty
30a6c98c08 Room name in bold 2019-07-15 17:29:37 +02:00
Benoit Marty
61bb4c0427 Introduce CreateRoomActivity, a simple container for [CreateRoomFragment] 2019-07-15 17:26:48 +02:00
Benoit Marty
3c25088243 Filter rooms 2019-07-15 17:26:48 +02:00
Benoit Marty
fc1c0caea3 Avoid displaying two loaders if there is no elements between them 2019-07-15 17:25:59 +02:00
Valere
25f1d21bc7 Edit history
Get history from API


cleaning


Updated change log


Missing copyrights


Code review


cleaning
2019-07-15 14:57:12 +02:00
Benoit Marty
0289d2ee87 Simpler code 2019-07-15 10:48:44 +02:00
Benoit Marty
222201cc64 Fix crash observe on the PlayStore (#341) 2019-07-15 10:48:44 +02:00
Benoit Marty
b15dea6de3
Merge pull request #338 from vector-im/feature/green_encrypt
Text in green when encrypting
2019-07-15 10:46:44 +02:00
Benoit Marty
2ba83e456d
Merge pull request #343 from vector-im/feature/click_on_redacted_event
Handle click on redacted event
2019-07-15 10:46:06 +02:00
Benoit Marty
e2ea76f871 Fix crash reported by PlayStore 2019-07-12 16:48:35 +02:00
Benoit Marty
3625c462f0 Click on redacted event 2019-07-12 13:51:37 +02:00
Benoit Marty
41465450d8 Code cleanup 2019-07-12 10:45:08 +02:00
Benoit Marty
bd009caaf1 Code cleanup 2019-07-12 10:22:58 +02:00
Benoit Marty
33252c3b65 Green text color during encrypting 2019-07-12 10:16:43 +02:00
Benoit Marty
919dec4a56 Add ".debug" to the applicationId to be able to install the app along with the prod version 2019-07-11 17:59:07 +02:00
Benoit Marty
43b3680774 Prepare next release 2019-07-11 17:44:58 +02:00
Benoit Marty
52dced43ff Fix version code issue 2019-07-11 16:49:06 +02:00
ganfra
252b2ea30a
Merge pull request #334 from vector-im/feature/general_perf
Feature/general perf
2019-07-11 15:52:00 +02:00
Benoit Marty
f65becf7c0 Rework login screen before release 2019-07-11 14:38:30 +02:00
Valere
d0b145d031 Edit emote 2019-07-11 12:29:02 +02:00
Valere
98306e223b
Merge pull request #322 from vector-im/feature/clean
Improve reply feature
2019-07-11 11:46:00 +02:00
Benoit Marty
c9fe1adb77 Add a debug button to test crash of the app 2019-07-11 10:36:59 +02:00
ganfra
1b95336ad3 EventEntity|TimelineEventEntity : remove UUID as primary key and use auto-incremented Long 2019-07-11 10:25:30 +02:00
Valere
54b1d18812 Merge remote-tracking branch 'origin/feature/clean' into feature/clean 2019-07-10 18:07:03 +02:00
Valere
3aa30e5f15 Fix reply of reply 2019-07-10 18:06:44 +02:00
Benoit Marty
ddf4a81905 Do not display the banner when keys backup is sending keys 2019-07-10 18:04:27 +02:00
Benoit Marty
794fd650a4 Mutualize code, and also, when replying to an edited event, use the last text in the reply prefix content 2019-07-10 17:37:22 +02:00
Benoit Marty
9a57a02996 Cleaner code: add TimelineEvent to special modes 2019-07-10 17:05:32 +02:00
Benoit Marty
7e8cd07e1e Do not send edition if text is identical 2019-07-10 16:32:44 +02:00
Benoit Marty
d613abf4b4 i18n edited_suffix 2019-07-10 15:29:52 +02:00
Benoit Marty
c8ab53e39c Video visibility fix 2019-07-10 14:11:49 +02:00
Benoit Marty
e6409d4c60 Create a common canReact() method 2019-07-10 12:10:55 +02:00
Benoit Marty
19c7de687e We can react on e2e room text event 2019-07-10 11:51:09 +02:00
Benoit Marty
1918302297 Reply with formatted content 2019-07-10 11:29:47 +02:00
Valere
a09850b16c
Merge pull request #316 from vector-im/feature/initial_sync_progress
Feature/initial sync progress
2019-07-09 17:58:24 +02:00
Valere
c9931e3ba3 Block interaction on initial sync 2019-07-09 17:36:08 +02:00
Valere
fc302c1b5a FIx / crash notification drawer empty nam 2019-07-09 17:35:50 +02:00
Benoit Marty
34ac987494 Cleanup 2019-07-09 16:36:46 +02:00
Benoit Marty
8a0c9ae9b0 Rename PreferencesManager to VectorPreferences for code clarity 2019-07-09 16:29:24 +02:00
Benoit Marty
a79227424f Convert PreferencesManager file to Kotlin 2019-07-09 16:07:16 +02:00
Benoit Marty
ffe0b9712c Convert file to Kotlin 2019-07-09 15:50:15 +02:00
Valere
fa81d1a9c7 Fix / revert bad refactor rename 2019-07-09 15:38:44 +02:00
Valere
dba4df6836 clean 2019-07-09 15:38:44 +02:00
Valere
95d83db90c WIP 2019-07-09 15:38:44 +02:00
Benoit Marty
0919b9460d Code quality: split long lines 2019-07-09 15:26:32 +02:00
Benoit Marty
ba589e7961 Add missing permission request 2019-07-09 15:03:21 +02:00
Benoit Marty
5dc83d64c1 Fix compilation issue 2019-07-09 15:03:21 +02:00
Benoit Marty
9a4eb8e9a4 add getFileUrl extension 2019-07-09 15:03:21 +02:00
Benoit Marty
058e7153a1 Fix bug 2019-07-09 15:03:21 +02:00
Benoit Marty
d7b2371854 Add long click listener to file items 2019-07-09 15:03:21 +02:00
Benoit Marty
b0c939866f Download file - typo 2019-07-09 15:03:21 +02:00
Benoit Marty
a07f8b615e Download file - WIP 2019-07-09 15:03:21 +02:00
Benoit Marty
12bd85e0a9 Decrypt video file 2019-07-09 15:02:31 +02:00
Benoit Marty
1b82ed5abb Fix regression 2019-07-09 15:02:31 +02:00
Benoit Marty
ea77686746 Send file: cleanup 2019-07-09 15:02:31 +02:00
Benoit Marty
8a5612be3d Send file: improve UI feedback 2019-07-09 15:02:31 +02:00
Valere
b73d3b15f8
Merge pull request #317 from vector-im/feature/realm_entity_rework
Feature/realm entity rework
2019-07-09 15:01:05 +02:00
Valere
8777d13d8b Fix / view source, decrypted source was not correct 2019-07-09 14:22:40 +02:00
Valere
d52613d723 Trick / Remove home progress blank paddings 2019-07-09 11:17:36 +02:00
ganfra
dd07f5c2a6 TimelineEvent : update sender data when loading room members and prune event (+ remove RoomSummaryMapper param) 2019-07-08 15:32:24 +02:00
Valere
7e6e09bc19 fix / compilation 2019-07-08 15:30:11 +02:00
Valere
1d11a163af Notification resolver try to decrypt 2019-07-08 15:08:49 +02:00