oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
6830 commits 3 branches 878 tags 462 MiB
Commit graph

70 commits

Author SHA1 Message Date
Niels Andriesse
a88322a033 Move files 2021-05-18 09:12:33 +10:00
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +10:00
Niels Andriesse
b248b5c52b Fix build 2021-05-17 13:37:12 +10:00
Niels Andriesse
11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
Niels Andriesse
faa8c9443f Hardcode community guidelines 2021-05-14 15:17:16 +10:00
Brice-W
f51268b587 open group invitation sending part 2021-05-12 13:41:00 +10:00
jubb
35aec04ac9 feat: member counts in v2 open group ConversationActivity 2021-05-05 13:52:15 +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
ef19c0d10e fix: fixing up LokiMessageDatabase.kt table structure, deletion closer to finished 2021-04-29 17:13:42 +10:00
Niels Andriesse
761c12addd Clean 2021-04-29 10:02:07 +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
jubb
7f0962b3d4 Merge branch 'fix_profile_nulls' into open_groups_V2 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
 2021-04-28 13:53:50 +10:00
Niels Andriesse
7150374c94 Clean 2021-04-27 14:26:26 +10:00
Niels Andriesse
69f05dabdf Clean 2021-04-26 11:23:09 +10:00
jubb
96e604d06b feat: more opengroup in chat manager, poller and API. refactor mentions to libsession 2021-04-15 17:17:55 +10:00
Brice-W
9cdcdc43a6 redesign of group update messages management 2021-04-14 16:37:04 +10:00
Brice-W
30b47a32cb Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-04-08 15:21:46 +10:00
Brice-W
9ca6986b71 fix sync of expiration timer update messages between linked devices 2021-04-06 16:05:59 +10:00
Brice-W
d7c03c9d0a group updates fixes 2021-03-26 15:46:37 +11:00
Brice-W
28cecc0236 expiration timer messages generation updated 2021-03-23 09:58:17 +11:00
Ryan ZHAO
54da77a89b clean 2021-03-12 15:23:29 +11:00
Ryan ZHAO
9d4c3bf722 send read receipt using new pipeline 2021-03-05 10:17:34 +11:00
Ryan ZHAO
e0ff5a7e7a fix sending expiration update message 2021-03-04 17:14:12 +11:00
Ryan ZHAO
88ac390495 plug in closed group message sender 2021-03-04 14:54:32 +11:00
Ryan ZHAO
0ea1ed15e7 WIP: make attachment work 2021-03-02 17:22:56 +11:00
Ryan ZHAO
d9eaedd6ae hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
Ryan ZHAO
6f002311b8 clean up unused message types 2021-02-23 16:23:45 +11:00
Ryan ZHAO
fec13ba72e clean up unused code 2021-02-23 15:56:42 +11:00
Ryan ZHAO
ff36fbb6a1 further cleaning up on stickers 2021-02-23 15:07:31 +11:00
Ryan ZHAO
6b8228c76d minor fix 2021-02-23 11:59:13 +11:00
Ryan ZHAO
2f57090cfa further clean up on session restoration 2021-02-23 11:56:03 +11:00
Ryan ZHAO
fcfaa32073 clean up non-sense code 2021-02-22 16:46:09 +11:00
Ryan ZHAO
5b15decdd6 further cleaning on signal sticker 2021-02-22 15:07:16 +11:00
Ryan ZHAO
b2225697b4 WIP: clean up unused signal stuff 2021-02-22 14:58:06 +11:00
Ryan ZHAO
c138f20be5 Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor_clean_0 2021-02-22 13:36:37 +11:00
Ryan ZHAO
0ec940ea32 clean up location 2021-02-22 13:30:48 +11:00
Ryan ZHAO
19a829d011 WIP: clean up signal protocols (stickers) 2021-02-22 10:06:40 +11:00
Ryan ZHAO
958ec690f1 WIP: clean up signal protocols 2021-02-19 11:03:58 +11:00
Brice-W
dbf7715977 missing translations (Fixes #445 & #446) 2021-02-19 10:05:24 +11:00
Ryan ZHAO
9d0831b874 remove shared sender keys 2021-02-18 14:14:05 +11:00
Ryan ZHAO
20ec889730 clean up V1 closed group 2021-02-17 16:09:36 +11:00
Ryan ZHAO
7a17b5769a clean up V1 multi device 2021-02-17 12:27:00 +11:00
jubb
6a8e0ae195 feat: use new explicit groups 2021-02-11 16:34:01 +11:00
Ryan ZHAO
6c857e203b clean 2021-02-04 10:28:51 +11:00
ryanzhao
307da3b2be clean logging 2021-02-03 12:22:40 +11:00
Ryan ZHAO
1e93d4651c clean 2021-02-02 15:40:43 +11:00
Ryan ZHAO
94913a334c clean 2021-02-02 15:10:23 +11:00
Ryan ZHAO
809ef0b6bc minor fix 2021-02-02 12:00:11 +11:00
Ryan ZHAO
c8149209a1 clean & minor fix 2021-02-01 17:00:32 +11:00
Ryan ZHAO
c7af1cabe3 clean 2021-02-01 12:10:48 +11:00