Commit Graph

783 Commits

Author SHA1 Message Date
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
43fbc3de55 Clean up create private chat screen 2021-06-02 11:34:30 +10:00
nielsandriesse
9888f23789 Fix ugly color 2021-06-02 11:00:40 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse
23100962e3 Clean 2021-06-02 10:12:49 +10:00
nielsandriesse
19550f7be9 Merge branch 'dev' into ui 2021-06-02 10:00:36 +10:00
nielsandriesse
86ccc3767e Update translations 2021-06-02 09:53:02 +10:00
nielsandriesse
8b084c89b9 Implement conversation activity toolbar 2021-06-01 16:17:14 +10:00
nielsandriesse
dc4a7d0761 Apply correct message bubble margins 2021-06-01 15:43:37 +10:00
nielsandriesse
958cd54b75 Stub views for different message types 2021-06-01 14:56:58 +10:00
nielsandriesse
3b18b0985b Add date break header 2021-06-01 14:38:52 +10:00
nielsandriesse
e177fc4689 Fix outgoing message layout 2021-06-01 14:28:14 +10:00
nielsandriesse
7f3b714401 Add VisibleMessageContentView 2021-06-01 13:26:57 +10:00
nielsandriesse
a23cfbc11d Implement parts of the visible message view 2021-06-01 13:01:03 +10:00
nielsandriesse
d20f81bd2e Merge branch 'dev' into ui 2021-06-01 10:08:10 +10:00
nielsandriesse
d3776ae0e6 Enable data extraction notifications 2021-06-01 10:07:37 +10:00
nielsandriesse
b000be9037 Add isControlMessage convenience variable 2021-06-01 10:02:20 +10:00
nielsandriesse
7710a2c32f Distinguish between control messages and visible messages 2021-06-01 09:48:02 +10:00
nielsandriesse
7ab9d3d8dc Clean remaining message record classes 2021-05-31 16:26:46 +10:00
nielsandriesse
7e9116df9c Clean up MessageRecord 2021-05-31 16:20:46 +10:00
nielsandriesse
1952b0e3be Clean up DisplayRecord 2021-05-31 15:53:25 +10:00
nielsandriesse
7ca940c6aa Merge branch 'dev' into ui 2021-05-31 14:52:12 +10:00
nielsandriesse
b8a85c35c4 Update version number 2021-05-31 14:31:36 +10:00
nielsandriesse
502d485235 Hook up message body 2021-05-31 14:29:11 +10:00
nielsandriesse
b346a85d57 Add basic conversation screen components 2021-05-31 14:06:02 +10:00
nielsandriesse
1e1e3bf0e8 Update version number 2021-05-31 13:13:50 +10:00
nielsandriesse
e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00
Niels Andriesse
b9e2b665e8
Merge pull request #586 from iArchitSharma/patch-2
Full Hindi Translation
2021-05-31 08:24:46 +10:00
Archit Sharma
f2a8d50a4d
All Hindi Translation done 2021-05-28 19:56:20 +07:00
nielsandriesse
1262f80a1f Clean up ProfilePictureView 2021-05-28 16:09:15 +10:00
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao
a81c17057f Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-28 11:22:58 +10:00
ryanzhao
497405fe50 clean 2021-05-28 11:22:46 +10:00
ryanzhao
c0d4dd741c debug 2021-05-28 11:22:06 +10:00
nielsandriesse
0ef576da73 Update version number 2021-05-28 11:02:55 +10:00
Ryan ZHAO
a66d2c97e0 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 16:52:12 +10:00
Ryan ZHAO
93dfbcaae2 clean 2021-05-27 16:51:59 +10:00
Niels Andriesse
193454beec Update build number 2021-05-27 16:19:20 +10:00
Niels Andriesse
bd9db0d248
Merge pull request #521 from hjubb/storage_access_warning
Don't Use Legacy External Storage
2021-05-27 16:18:10 +10:00
Niels Andriesse
e71760d08f Update build number 2021-05-27 16:08:13 +10:00
Niels Andriesse
ed87961850
Merge pull request #568 from hjubb/improve_background_jobs
More Efficient Thread Trimming & Database Cleanup
2021-05-27 16:04:47 +10:00
jubb
72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
jubb
bcff8af159 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-27 15:43:59 +10:00
Niels Andriesse
5d262a4bba Update version number 2021-05-27 15:43:44 +10:00
Niels Andriesse
49ee9b9991 Delete unnecessary transaction 2021-05-27 15:39:46 +10:00
Ryan ZHAO
0e89d88459 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 15:32:00 +10:00
Ryan ZHAO
e6cdd3ee0e add logic and UI in create private chat view 2021-05-27 15:31:48 +10:00
Niels Andriesse
85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
jubb
468b8f25c5 refactor: improve docs 2021-05-27 11:06:47 +10:00
jubb
e389044f25 refactor: remove test logs 2021-05-27 11:05:47 +10:00
jubb
ea9592a6a5 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-27 11:02:46 +10:00
jubb
6fd1a82bed Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-26 15:22:38 +10:00
jubb
efa36d4cea refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message
migrate TrimThreadJob.kt to new job system

deleting more open group references in removal

open group last message / last deletion now sets after processing vs after fetching
2021-05-26 15:22:19 +10:00
Niels Andriesse
ad51bbb847 Update open group guidelines 2021-05-25 16:24:37 +10:00
Niels Andriesse
02bbd3b8bf Clean up onboarding 2021-05-25 11:48:59 +10:00
Niels Andriesse
9fa3e37e68 Update build number 2021-05-25 09:17:28 +10:00
Niels Andriesse
128116ec36 Fix crash 2021-05-25 09:17:06 +10:00
Niels Andriesse
5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse
ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse
dfce9d636a Update build number 2021-05-24 16:10:51 +10:00
Niels Andriesse
e674e40959 Experimental performance improvement 2021-05-24 16:10:27 +10:00
Niels Andriesse
550d8b61c7 Quick fix crash 2021-05-24 15:31:46 +10:00
ryanzhao
25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse
5353e124df Update translations 2021-05-24 14:46:28 +10:00
Niels Andriesse
2a0a5a2326 Fix case 2021-05-24 14:33:10 +10:00
Niels Andriesse
08a2295f16
Merge pull request #562 from hjubb/pubkey_validation_on_open_group
Validate Public Key When Adding Open Group
2021-05-24 14:32:18 +10:00
jubb
4f84b976c5 fix: return error early if the public key is not expected length or format with an appropriate message 2021-05-24 14:01:20 +10:00
Niels Andriesse
639146cc0a Simplify & fix from_server_id usage 2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac Merge branch 'dev' into polling-limit 2021-05-24 13:37:13 +10:00
Niels Andriesse
95657195e6 Update build number 2021-05-24 13:24:35 +10:00
Brice-W
2969d4b161 clean 2021-05-24 13:14:37 +10:00
Brice-W
6c37e7a93f move logic from Storage to OpenGroupAPIV2 2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 12:58:35 +10:00
Niels Andriesse
f64fb68e96
Merge branch 'dev' into fix_hardcoded_strings 2021-05-24 12:52:10 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames
Nicknames
2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda Fix open group display name handling 2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a implementation of polling limit on open groups 2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8 Add contacts migration 2021-05-24 11:35:05 +10:00
Niels Andriesse
04b62df83c Make user details bottom sheet look better 2021-05-24 11:08:08 +10:00
jubb
43b297b334 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-24 10:34:47 +10:00
Niels Andriesse
e7ae08fe7a Clean 2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 09:19:56 +10:00
Niels Andriesse
051dbbfef9 Update version number 2021-05-24 08:54:38 +10:00
jubb
7c7ace9ecd refactor: extract hardcoded strings
allows fix for #529
2021-05-21 16:49:06 +10:00
Niels Andriesse
dfd3ccc5d2 Clean 2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00
Niels Andriesse
01b86fcc2f Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-05-21 15:10:49 +10:00
Niels Andriesse
a4a11e8e5e Fix indentation 2021-05-21 15:09:50 +10:00
Niels Andriesse
6302b5d65c
Merge pull request #553 from Brice-W/profile-picture-fix
Fix Home Screen Profile Picture Refreshing
2021-05-21 15:09:18 +10:00
Niels Andriesse
49c3ffd9ca Remove redundant code 2021-05-21 15:02:34 +10:00
Ryan ZHAO
953f6d8c17 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-21 14:55:15 +10:00
Ryan ZHAO
d52787a661 try to use jobs to mark if all open groups are caught up 2021-05-21 14:55:06 +10:00
Brice-W
c90ab52cdf clean 2021-05-21 13:36:21 +10:00
Brice-W
05535983e2 clean 2021-05-21 13:34:44 +10:00
Brice-W
b58e4427dd fix profile picture not updated on home UI 2021-05-21 13:24:49 +10:00
Niels Andriesse
ff96bb05a8 Implement remaining bits and pieces 2021-05-21 11:09:03 +10:00
Niels Andriesse
da331b036e Integrate new closed group poller 2021-05-21 10:30:02 +10:00