oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity
session-android/app/src/main/java/org/thoughtcrime/securesms
History
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
..
animation restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
attachments Clean 2021-04-26 11:39:23 +10:00
audio clean logging 2021-02-03 12:22:40 +11:00
avatar clean logging 2021-02-03 12:22:40 +11:00
backup clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
components Clean 2021-04-27 14:26:26 +10:00
contacts WIP clean & make things compile 2021-01-19 09:12:44 +11:00
contactshare WIP: clean up unused signal stuff 2021-02-22 14:58:06 +11:00
conversation Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation 2021-04-28 17:41:30 +10:00
crypto clean 2021-03-12 15:23:29 +11:00
database Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation 2021-04-28 17:41:30 +10:00
dependencies refactor: remove old jobs and refactor any remaining calls to use new jobs 2021-04-08 16:12:54 +10:00
events WIP clean 2021-01-14 10:28:07 +11:00
giph clean 2021-02-04 10:28:51 +11:00
glide clean logging 2021-02-03 12:22:40 +11:00
groups hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
imageeditor restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
jobmanager clean up jobs 2021-02-23 11:29:07 +11:00
jobs Take care of remaining loose ends 2021-04-27 14:48:57 +10:00
linkpreview Clean 2021-04-26 11:23:09 +10:00
logging clean logging 2021-02-03 12:22:40 +11:00
loki Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation 2021-04-28 17:41:30 +10:00
longmessage clean logging 2021-02-03 12:22:40 +11:00
mediapreview fix: unclosed cursor error message 2021-03-25 16:40:15 +11:00
mediasend clean up V1 closed group 2021-02-17 16:09:36 +11:00
mms Clean 2021-04-26 11:14:45 +10:00
net clean logging 2021-02-03 12:22:40 +11:00
notifications Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending 2021-03-18 09:26:13 +11:00
permissions clean 2021-01-29 16:35:47 +11:00
preferences fix: crash on backup prefs 2021-03-05 10:16:55 +11:00
profiles clean up unused code 2021-02-23 15:56:42 +11:00
providers clean up unused code 2021-02-23 15:56:42 +11:00
qr clean up unused code 2021-02-23 15:56:42 +11:00
scribbles clean logging 2021-02-03 12:22:40 +11:00
search clean up V1 closed group 2021-02-17 16:09:36 +11:00
service Merge branch 'specific-group-updates' into data-extraction-2 2021-04-20 15:42:04 +10:00
sms hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
sskenvironment Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction 2021-03-23 10:42:30 +11:00
util clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
video clean logging 2021-02-03 12:22:40 +11:00
ApplicationContext.java Resolve various loose ends 2021-04-27 14:36:03 +10:00
BaseActionBarActivity.java WIP clean 2021-01-15 16:51:53 +11:00
BaseActivity.java WIP clean 2021-01-15 16:51:53 +11:00
BindableConversationItem.java Clean 2021-04-26 11:23:09 +10:00
DatabaseUpgradeActivity.java refactor: remove old jobs and refactor any remaining calls to use new jobs 2021-04-08 16:12:54 +10:00
DummyActivity.java restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
ExpirationDialog.java WIP clean 2021-01-15 16:51:53 +11:00
MediaDocumentsAdapter.java clean logging 2021-02-03 12:22:40 +11:00
MediaGalleryAdapter.java make things compile 2021-01-21 15:42:43 +11:00
MediaOverviewActivity.java disable data extraction notification sending 2021-04-21 13:43:29 +10:00
MediaPreviewActivity.java disable data extraction notification sending 2021-04-21 13:43:29 +10:00
MessageDetailsActivity.java Clean 2021-04-27 14:26:26 +10:00
MessageDetailsRecipientAdapter.java make things compile 2021-01-21 15:42:43 +11:00
MuteDialog.java restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
PassphrasePromptActivity.java clean logging 2021-02-03 12:22:40 +11:00
PassphraseRequiredActionBarActivity.java clean logging 2021-02-03 12:22:40 +11:00
ShareActivity.java hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
ShortcutLauncherActivity.java clean up V1 closed group 2021-02-17 16:09:36 +11:00
Unbindable.java restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00