TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-03 06:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
fa528c47d5
session-android/app/src/main/java/org/thoughtcrime/securesms
History
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
..
animation
attachments fix: deletion fixed up 2021-04-30 14:19:37 +10:00
audio
avatar
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
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 2021-05-03 15:37:53 +10:00
crypto clean 2021-03-12 15:23:29 +11:00
database Merge remote-tracking branch 'upstream/dev' into open_groups_V2 2021-05-03 15:37:53 +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
giph
glide
groups hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
imageeditor
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
loki Merge remote-tracking branch 'upstream/dev' into open_groups_V2 2021-05-03 15:37:53 +10:00
longmessage
mediapreview fix: unclosed cursor error message 2021-03-25 16:40:15 +11:00
mediasend
mms Clean 2021-04-26 11:14:45 +10:00
net
notifications Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending 2021-03-18 09:26:13 +11:00
permissions
preferences make screenlock work within 60s 2021-04-20 17:02:14 +10: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
search
service fix for API 21 2021-04-29 13:23:02 +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
AppContext.kt Use global Kovenant config 2021-04-29 10:10:41 +10:00
ApplicationContext.java Use global Kovenant config 2021-04-29 10:10:41 +10:00
BaseActionBarActivity.java
BaseActivity.java
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
ExpirationDialog.java
MediaDocumentsAdapter.java
MediaGalleryAdapter.java
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
MuteDialog.java
PassphrasePromptActivity.java fix crash 2021-04-28 15:59:30 +10:00
PassphraseRequiredActionBarActivity.java
ShareActivity.java hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
ShortcutLauncherActivity.java
Unbindable.java