TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,927 Commits 46 Branches 892 Tags 481 MiB
13909e152c
Commit Graph

686 Commits

Author SHA1 Message Date
Brice-W
47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse
ed6db6f4e7 Merge branch 'dev' into ui 2021-06-11 13:41:50 +10:00
Niels Andriesse
f4ae16239e Clean 2021-06-11 11:27:15 +10:00
Brice-W
b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Brice-W
3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Harris
51061cac0e Merge remote-tracking branch 'upstream/dev' into identity_key_encryption 2021-06-08 11:53:38 +10:00
Brice-W
14d401b27a fix 2021-06-07 14:46:54 +10:00
Harris
91aefb7c87 feat: upgrade to keystore sealed identity key preferences 2021-06-07 11:53:17 +10:00
nielsandriesse
d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
nielsandriesse
3bf5a50439 Fix readability issues & simplify code 2021-06-04 16:32:19 +10:00
Brice-W
1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
Brice-W
6fb461f7d8 reset zombie members list if group already exists 2021-06-04 11:24:01 +10:00
Brice-W
1a117b0189 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-06-03 11:51:57 +10:00
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse
15d864cd2a Update documentation 2021-06-02 09:38:22 +10:00
Harris
2bdb4d18a2 fix: property name for json deserialisation 2021-05-31 14:24:43 +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
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao
4f7d26d86e debug for new encryption 2021-05-28 12:04:37 +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
e16322977b Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2021-05-28 11:01:41 +10:00
nielsandriesse
c6976ca3cd Fix naming confusion 2021-05-28 11:00:49 +10:00
Harris
4a8ce784b8 fix: no longer using the wrong deletion IDs for open group deletions 2021-05-28 10:50:07 +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
592825dcc6 implement get session id from ons name api 2021-05-27 16:23:15 +10:00
Niels Andriesse
2441d86b32 Make member ordering consistent 2021-05-27 16:07:54 +10:00
jubb
72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +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
Niels Andriesse
85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
ryanzhao
ae23266058 wip: implement ons name 2021-05-26 16:34:08 +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
Brice-W
365ccda113 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-05-25 16:15:51 +10:00
Brice-W
5eaef76b02 don't update zombie members if current user is removed 2021-05-25 15:45:43 +10:00
Niels Andriesse
abf2c05424 Debug closed group creation issue 2021-05-25 10:56:29 +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
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
c058b332da Fix typo 2021-05-24 14:14:09 +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
90dca7149a Remove redundant this 2021-05-24 13:32:16 +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
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
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
66e7df22bb Don't notify for closed group control messages 
This addresses an issue where:

• someone would create a closed group
• on other peoples' devices this control message would be received through a background poll or a push notification
• the received message timestamps table would be updated
• processing wouldn't be finished (during a background poll or while handling a push notification the system can cut you off at any time)
• some of the added users don't see the new closed group because when they open the app and get the control message from their swarm it's considered a duplicate and isn't processed again
 2021-05-24 08:53:27 +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
a4a11e8e5e Fix indentation 2021-05-21 15:09:50 +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
Niels Andriesse
910787a960 Fix polling bug 2021-05-21 13:12:34 +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
Niels Andriesse
a3a62b6dbb Implement ClosedGroupPollerV2 2021-05-21 10:24:48 +10:00
Niels Andriesse
2a756375a8 Merge branch 'dev' into variable-rate-polling 2021-05-21 10:07:41 +10:00
Niels Andriesse
12ae8d4051 Debug 2021-05-21 09:26:25 +10:00
Niels Andriesse
8e836aa175 Fix build 2021-05-21 09:16:24 +10:00
Niels Andriesse
e42b884b13 Upgrade Kryo 2021-05-21 09:05:55 +10:00
Niels Andriesse
b0f564672b Update build number 2021-05-21 09:04:32 +10:00
Brice-W
1cdbad5eaa Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-05-20 16:16:35 +10:00
Niels Andriesse
dd92484b4e Create ClosedGroupPollerV2 2021-05-20 16:15:20 +10:00
Ryan ZHAO
563a13d208 fix nickname usage & clean 2021-05-20 14:06:42 +10:00
Ryan ZHAO
ca723a3796 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 12:01:22 +10:00
Ryan ZHAO
30c7a4c1bb fix nickname in group creating & editing 2021-05-20 12:01:08 +10:00
Niels Andriesse
039b667f59
Merge pull request #546 from hjubb/fix_missing_deps 
Use Maven Central Instead of Bintray
 2021-05-20 11:53:08 +10:00
Ryan ZHAO
38ed5c2187 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 11:15:24 +10:00
Niels Andriesse
7e10910862 Switch to dedicated server 2021-05-20 10:58:52 +10:00
nielsandriesse
747a27ddda Add file server instability modal 2021-05-19 15:25:36 +10:00
Harris
99e6382f2e refactor: use lazysodium version on maven central instead of bintray (no longer available) 2021-05-19 15:12:35 +10:00
Niels Andriesse
984add5d09
Merge pull request #544 from hjubb/fix_resources 
Remove Unused Resources + Updating Translations
 2021-05-19 11:28:20 +10:00
Harris
84e8418d57 Merge remote-tracking branch 'upstream/dev' into origin/fix_resources 2021-05-19 10:57:47 +10:00
nielsandriesse
eee9d6688e Debug 2021-05-19 10:31:08 +10:00
nielsandriesse
4d44bed67d Improve performance 2021-05-19 10:07:09 +10:00
nielsandriesse
fda66d3f5d Refactor V2 open group poller 2021-05-19 10:03:31 +10:00
nielsandriesse
80c90fa53d Remove incorrectly maintained & unused value 2021-05-19 09:03:49 +10:00
nielsandriesse
2a3d06e485 Fix duplicate message handling 2021-05-19 08:56:44 +10:00
Niels Andriesse
7d241eab6c Add uncommitted file 2021-05-18 16:15:27 +10:00
Niels Andriesse
6243443262 Move files 2021-05-18 16:11:38 +10:00
Niels Andriesse
4078a9c4b5 Move files 2021-05-18 16:03:47 +10:00
Niels Andriesse
ab83e49f93 Remove duplicated/unused code 2021-05-18 15:55:24 +10:00
Niels Andriesse
918e1ea3cf
Merge pull request #542 from Brice-W/error-handling-group-creation 
Improved Group Creation Error Handling
 2021-05-18 15:05:32 +10:00
Niels Andriesse
7208bb0421 Fix build 2021-05-18 15:03:17 +10:00
Niels Andriesse
68225e00be Clean 2021-05-18 14:45:37 +10:00
Niels Andriesse
8a20c46bd4 Fix missing compile target 2021-05-18 14:08:21 +10:00
Niels Andriesse
81b0530163 Clean up libsession Gradle file 2021-05-18 13:27:51 +10:00
jubb
573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources 
# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ja/strings.xml
 2021-05-18 10:09:26 +10:00
Niels Andriesse
47ff53d559 Remove SignalServiceMessageReceiver 2021-05-18 09:54:16 +10:00
Niels Andriesse
c1548a4e51 Move files 2021-05-18 09:50:16 +10:00
Niels Andriesse
dc8938c269 Move protos 2021-05-18 09:44:06 +10:00
Niels Andriesse
c124f86f6b Move protos 2021-05-18 09:36:20 +10:00
Niels Andriesse
961972a723 Move protos 2021-05-18 09:34:45 +10:00
Niels Andriesse
c9ebcc580f Move files 2021-05-18 09:26:08 +10:00
Niels Andriesse
40d2fd25d9 Move files 2021-05-18 09:21:56 +10:00
Niels Andriesse
ce3b32c03e Move files 2021-05-18 09:17:22 +10:00
Niels Andriesse
a88322a033 Move files 2021-05-18 09:12:33 +10:00
jubb
0f435ca040 refactor: remove more unnecessary strings from libsession's values 2021-05-17 17:29:39 +10:00
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +10:00
Brice-W
e40609f6a8 clean 2021-05-17 14:19:37 +10:00
Brice-W
059a84f3ce Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation 2021-05-17 14:18:09 +10:00
Brice-W
ff50d2f1fd error handling if something goes wrong when creating a group 2021-05-17 14:16:04 +10:00
Niels Andriesse
cf3f0fbe57 Minor refactoring 2021-05-17 13:57:18 +10:00
Niels Andriesse
11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
Niels Andriesse
3e75ed3cc4 Merge branch 'dev' into v2-file-server 2021-05-14 16:19:57 +10:00
Niels Andriesse
9ab58c2f0c Clean 2021-05-14 16:05:35 +10:00
jubb
8b5134b9ef fix: fixes the failing insertions possibly composite PK related 2021-05-14 15:55:38 +10:00
Brice-W
91c3ec6c7d Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation 2021-05-14 10:56:55 +10:00
Brice-W
f5a99b43c7 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-14 10:32:12 +10:00
Niels Andriesse
61c210837e Clean 2021-05-14 08:56:25 +10:00
Niels Andriesse
a2c886468d Clean 2021-05-13 16:14:54 +10:00
Niels Andriesse
ea71d285b7 Clean 2021-05-13 15:42:14 +10:00
Niels Andriesse
d9348c5442 Remove weird roundabout way of doing decryption 2021-05-13 15:27:08 +10:00
Brice-W
2f0509a03b join open group from received invitation 2021-05-13 14:29:29 +10:00
Ryan ZHAO
7b8a025947 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-13 14:25:19 +10:00
Ryan ZHAO
85eff702c3 clean 2021-05-13 14:24:30 +10:00
Niels Andriesse
d83c257491 Use V2 file server for profile pictures 
Also don't randomly rotate profile key
 2021-05-13 14:24:27 +10:00
Niels Andriesse
3e1727fdbc Debug 2021-05-13 13:34:35 +10:00
Niels Andriesse
7c5b4aafec Debug 2021-05-13 13:19:08 +10:00
Niels Andriesse
0faeb7becf Update AttachmentUploadJob for the V2 file server 2021-05-13 11:11:42 +10:00
Niels Andriesse
75ce0f056c Use snodes returned in 421 response 2021-05-13 10:42:53 +10:00
Niels Andriesse
b798f49512 Minor performance optimization 2021-05-13 10:38:13 +10:00
Niels Andriesse
288d76d292 Add documentation 2021-05-13 10:33:34 +10:00
Niels Andriesse
115bc9b159 Speed up path building 2021-05-13 10:31:06 +10:00
Ryan ZHAO
b5dbec836c Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-13 10:25:52 +10:00
Ryan ZHAO
267a94b8ef minor fix 2021-05-13 10:24:32 +10:00
Niels Andriesse
3cab81c329 Fix message send job attachment upload handling 2021-05-13 09:38:39 +10:00
jubb
edc1454609 fix: unnamed open groups being processed by creating new threads after deletion 
job db not marking successful/unsuccessful properly

handling send and receive better / in order
 2021-05-12 16:48:18 +10:00
jubb
84fa3dfc86 Merge remote-tracking branch 'upstream/dev' into background_job_improvements 
# Conflicts:
#	libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
 2021-05-12 16:31:53 +10:00
ryanzhao
46a01010e1 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-12 16:31:11 +10:00
nielsandriesse
c5e0589751 Don't crash on unexpected deserialization error 2021-05-12 16:21:53 +10:00
nielsandriesse
bb850cf99e Minor job type refactoring 2021-05-12 16:17:25 +10:00
nielsandriesse
f5238982c3 Add missing message padding 2021-05-12 15:47:17 +10:00
nielsandriesse
174bccb0b7 Fix missing signature validation 2021-05-12 15:28:14 +10:00
ryanzhao
1e3ff1e6a1 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-12 15:11:18 +10:00
ryanzhao
4c63b724ee make editting nickname work 2021-05-12 15:11:09 +10:00
nielsandriesse
c8cf5ebfa0 Make custom error messages actually work 2021-05-12 14:52:24 +10:00
nielsandriesse
d8932416f1 Minor V2 open group refactoring 2021-05-12 14:48:13 +10:00
nielsandriesse
fa5edcefd5 Minor message type refactoring 2021-05-12 14:01:57 +10:00
Brice-W
f51268b587 open group invitation sending part 2021-05-12 13:41:00 +10:00
jubb
18818bf8da refactor: re-add the node limit 2021-05-12 11:24:08 +10:00
jubb
9f09977160 refactor: remove registration required for job serialization and test logs, don't try to read class object if the message send class is not of expected type 2021-05-12 10:43:17 +10:00
Brice-W
2a436edbf8 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-12 08:41:12 +10:00
Brice-W
b2a924ebf8 views created + database storage 2021-05-12 08:40:10 +10:00
Ryan ZHAO
b43000bdd0 WIP: enable contact with UI 2021-05-11 17:05:04 +10:00
jubb
8439d57115 refactor: let the periodic work run more frequently and never fail from excessive retries preventing from re-running. 
remove resume pending jobs from ApplicationContext onCreate and handle in home activity's onCreate instead.

prevent some illegal argument exceptions from Random.kt by returning null if empty
 2021-05-10 17:07:10 +10:00
Ryan ZHAO
be3b8a4b7e Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-07 16:31:54 +10:00
Ryan ZHAO
a16e67d1fd add new contact database api 2021-05-07 16:31:46 +10:00
jubb
e7377d640f fix: use AttachmentUploadJob instead of two download job keys in all types 2021-05-07 13:36:35 +10:00
jubb
d707433f28 docs: remove no long applicable docs 2021-05-07 12:03:04 +10:00
jubb
ccd9493f62 refactor: remove unlimited by array size and cap at 10_000_000 2021-05-07 12:02:12 +10:00
jubb
4fff5ac2dc refactor: make storage reference jobId by string in deletion, don't persist jobs we are about to delete, delete jobs that fail to serialize from storage (probably from corrupt or moved data classes) in temporary message send jobs 2021-05-07 11:48:03 +10:00
Ryan ZHAO
cbd6ae3bcb Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-07 10:33:27 +10:00
Brice-W
d98cef3c77 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-07 09:34:24 +10:00
Brice-W
89e0d9b0cf WIP 2021-05-07 09:30:50 +10:00
Niels Andriesse
3c3f6c25f1 Fix various bugs 2021-05-06 15:46:22 +10:00
Brice-W
9399da6bad handle the case when an added member is a zombie 2021-05-06 14:49:28 +10:00
jubb
a4b7b34f2e refactor: change request to use default pubkey 2021-05-06 13:48:35 +10:00
jubb
704723ed80 feat: add removing of the sent/received messages 2021-05-06 13:28:58 +10:00
jubb
50d3b52617 refactor: remove unused download in DotNetAPI.kt and add todo for upload migration 2021-05-05 17:50:29 +10:00
jubb
14a02a8511 fix: proper sending of join URL and removing server timestamp in proto parsing 2021-05-05 17:46:53 +10:00
jubb
e8bac5005e feat: file server v2 and syncing open groups v2 in config messages 2021-05-05 17:29:27 +10:00
jubb
35aec04ac9 feat: member counts in v2 open group ConversationActivity 2021-05-05 13:52:15 +10:00
jubb
d8e9e372d3 fix: add support for non-standard ports in opengroupv2 2021-05-04 15:52:08 +10:00
jubb
f3fa8626ed feat: compact polling server-wide 2021-05-04 14:51:21 +10:00
jubb
c102c5132e fix: don't use testnet 2021-05-04 09:06:59 +10:00
jubb
fa528c47d5 Merge remote-tracking branch 'upstream/dev' into open_groups_V2 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
#	libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
#	libsession/src/main/java/org/session/libsession/utilities/mentions/Mention.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/utilities/mentions/Mention.kt
 2021-05-03 15:37:53 +10:00
jubb
fe8dc2d392 fix: slight UI and handling protocols at onion request level 2021-05-03 15:21:53 +10:00
Brice-W
bb25877515 light refactor + OpenGroupUrlParser implementation & unit test 2021-05-03 14:15:39 +10:00
jubb
2999c138aa feat: add open group display name hex suffix 2021-05-03 11:29:04 +10:00
jubb
a58332a353 refactor: increase max poll time 2021-04-30 16:57:06 +10:00
jubb
7e14a315b9 refactor: compact polling and usage based polling 2021-04-30 16:56:39 +10:00
Brice-W
9ee167c173 handleOpenGroupInvitation skeleton added + region added 2021-04-30 16:09:11 +10:00
Brice-W
99a62d9e99 adding openGroupInvitation types in proto & class 2021-04-30 16:00:13 +10:00
Ryan ZHAO
e64ac14b77 fix crash & empty nickname bug 2021-04-30 15:36:50 +10:00
jubb
460babe930 fix: deletion fixed up 2021-04-30 14:19:37 +10:00
jubb
ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 2021-04-29 17:13:42 +10:00
Ryan ZHAO
a1edfb13ee Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-04-29 14:59:14 +10:00
Ryan ZHAO
a7c7d0c10f introduce Contact model 2021-04-29 14:59:04 +10:00
Ryan ZHAO
496e833333 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-04-29 13:29:12 +10:00
Brice-W
1f62990aff fix polling issue in closed groups 2021-04-29 13:10:18 +10:00
Niels Andriesse
f727244342
Merge pull request #514 from oxen-io/refactoring 
Minor Refactoring
 2021-04-29 10:11:02 +10:00
Niels Andriesse
761c12addd Clean 2021-04-29 10:02:07 +10:00
jubb
d05da5c447 Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
 2021-04-29 09:39:33 +10:00
jubb
51554f1cdf Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt
#	libsession/src/main/java/org/session/libsession/utilities/mentions/MentionsManager.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/api/SwarmAPI.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/api/opengroups/PublicChat.kt
#	libsignal/src/main/java/org/session/libsignal/service/loki/utilities/mentions/MentionsManager.kt
 2021-04-28 17:41:30 +10:00
Brice-W
ab68001b15 clean 2021-04-28 16:00:13 +10:00
jubb
9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 2021-04-28 14:46:50 +10:00
Brice-W
54ba848d09 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 14:21:16 +10:00
nielsandriesse
97c74bb3dc Fix polling 2021-04-28 14:10:44 +10:00