TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-30 19:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,721 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

88 Commits

Author SHA1 Message Date
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
fdede1c656 Clean 2021-04-26 11:39:23 +10:00
Niels Andriesse
25307068e8 Match iOS protobuf 2021-04-26 11:06:00 +10:00
Niels Andriesse
979c21ccbf Fix duplicated API 2021-04-23 16:09:47 +10:00
jubb
1e164f8648 feat: adding default group handling to frontend viewmodel 2021-04-20 17:22:36 +10:00
jubb
aea23a6fc1 feat: finishing up OpenGroupAPIV2.kt calls 2021-04-19 10:16:38 +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
jubb
0eadc55325 feat: add open group v2 storage and db methods, starting on new open group v2 poller 2021-04-13 17:17:16 +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
Niels Andriesse
8400c7606b
Merge pull request #493 from hjubb/pin_seed_certs 
Introduce service node seed certificates
 2021-04-07 15:12:13 +10:00
jubb
b149886068 feat: add certificate pem files, set up network security config and point seed pools to port accordingly 2021-04-07 14:49:52 +10:00
jubb
7121aa85fb refactor: use OpenGroupAPI.kt instead of PublicChatAPI.kt for all open group operations. 
Syncing open group notify conversation list listeners debounced so UI doesn't freeze on initial syncs
 2021-03-31 15:15:50 +11:00
jubb
1c1ce1424b fix: replace elvis on optional proto object with protobuf has flag check 2021-03-23 11:39:14 +11:00
Brice-W
8c7f23a4e3 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction 2021-03-23 10:42:30 +11:00
Brice-W
0578195d61 Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates 2021-03-22 15:12:09 +11:00
Brice-W
ddede475b4 Start of Update messages builder class implementation & usage for Input group updates 2021-03-19 16:25:00 +11:00
Ryan ZHAO
95646ed04e make error description show in the message detail activity 2021-03-16 16:31:52 +11:00
Ryan ZHAO
d7e525d828 clean 2021-03-12 14:52:59 +11:00
Ryan ZHAO
91f9138d62 clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
Ryan ZHAO
60f51af295 clean & fix expiration timer setting issue 2021-03-12 11:27:51 +11:00
Brice-W
6bc832f50a DataExtractionNotification type created and added to proto 2021-03-09 16:27:12 +11:00
Ryan ZHAO
d9eaedd6ae hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
jubb
d1b41a8933 feat: generate protobufs for new contacts 2021-02-25 10:45:07 +11:00
jubb
af35b68cb6 feat: add required annotations to match iOS 2021-02-25 10:39:06 +11:00
jubb
ee1f9fc790 feat: add contacts message in config message 2021-02-25 10:38:45 +11:00
Ryan ZHAO
d5343d5462 Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-24 16:39:04 +11:00
Niels Andriesse
851efb6f6e
Merge pull request #457 from hjubb/config_profile_info 
Adding profile information to the config sync messages
 2021-02-24 15:57:35 +11:00
jubb
62db34de59 feat: generate SignalServiceProtos 2021-02-23 15:54:48 +11:00
jubb
2fffcfa927 feat: add display, pfp and profile key to config message 2021-02-23 15:43:52 +11:00
jubb
7d7dbd7632 feat: add push notifying in the message sender to prevent self sends 2021-02-23 09:49:19 +11:00
Ryan ZHAO
8c016b3802 clean up signal service protocols 2021-02-22 11:29:22 +11:00
Ryan ZHAO
1db9ccdf27 clean up: signal service protocols 2021-02-22 10:41:27 +11:00
Ryan ZHAO
88bbc0b677 clean up stickers 2021-02-22 10:21:06 +11:00
Ryan ZHAO
19a829d011 WIP: clean up signal protocols (stickers) 2021-02-22 10:06:40 +11:00
Ryan ZHAO
04f140ee09 WIP: clean up signal service protos 2021-02-22 09:31:29 +11:00
Ryan ZHAO
b34809f4d5 WIP: clean up signal protocol 2021-02-19 16:06:10 +11:00
Ryan ZHAO
8cc78e8f4c WIP: clean up unused exceptions 2021-02-19 15:28:26 +11:00
Ryan ZHAO
d8104c0d5c WIP: clean up signal protocol storage 2021-02-19 15:11:30 +11:00
Ryan ZHAO
1e1b3e02e1 clean up session cipher, sealed session cipher, and old message version 2021-02-19 13:36:05 +11:00
Ryan ZHAO
f0020ea811 clean up decryption call back 2021-02-19 11:47:40 +11:00
Ryan ZHAO
bbd067873a WIP: clean up signal protocol 2021-02-19 11:35:06 +11:00
Ryan ZHAO
958ec690f1 WIP: clean up signal protocols 2021-02-19 11:03:58 +11:00
Ryan ZHAO
1a907fcf54 WIP: clean up signal protocol 2021-02-18 17:05:34 +11:00
Ryan ZHAO
0d2f5e0cde further cleaning on V1 multi device 2021-02-18 15:12:30 +11:00
Ryan ZHAO
9d0831b874 remove shared sender keys 2021-02-18 14:14:05 +11:00