You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

jubb b685846d7e Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt # libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt		4 years ago
..
animation	…
attachments	Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending	4 years ago
audio	clean logging	4 years ago
avatar	clean logging	4 years ago
backup	clean & refactor session protocol encryption	4 years ago
components	send typing indicator using new pipeline	4 years ago
contacts	WIP clean & make things compile	4 years ago
contactshare	WIP: clean up unused signal stuff	4 years ago
conversation	clean	4 years ago
crypto	clean	4 years ago
database	Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending	4 years ago
dependencies	clean	4 years ago
events	WIP clean	4 years ago
giph	clean	4 years ago
glide	clean logging	4 years ago
groups	hook up sending pipeline & clean	4 years ago
imageeditor	…
jobmanager	clean up jobs	4 years ago
jobs	clean	4 years ago
linkpreview	clean	4 years ago
logging	clean logging	4 years ago
loki	Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending	4 years ago
longmessage	clean logging	4 years ago
mediapreview	make things compile	4 years ago
mediasend	clean up V1 closed group	4 years ago
mms	refactor: inserting attachments with the messages so that they are linked properly to a mmsID	4 years ago
net	clean logging	4 years ago
notifications	Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending	4 years ago
permissions	clean	4 years ago
preferences	fix: crash on backup prefs	4 years ago
profiles	clean up unused code	4 years ago
providers	clean up unused code	4 years ago
qr	clean up unused code	4 years ago
scribbles	clean logging	4 years ago
search	clean up V1 closed group	4 years ago
service	clean	4 years ago
sms	hook up sending pipeline & clean	4 years ago
sskenvironment	fix blocked contacts can still see typing indicator and set disappearing messages	4 years ago
util	clean & refactor session protocol encryption	4 years ago
video	clean logging	4 years ago
ApplicationContext.java	Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending	4 years ago
BaseActionBarActivity.java	WIP clean	4 years ago
BaseActivity.java	WIP clean	4 years ago
BindableConversationItem.java	further cleaning up on stickers	4 years ago
DatabaseUpgradeActivity.java	final cleaning up	4 years ago
DummyActivity.java	…
ExpirationDialog.java	WIP clean	4 years ago
MediaDocumentsAdapter.java	clean logging	4 years ago
MediaGalleryAdapter.java	make things compile	4 years ago
MediaOverviewActivity.java	clean up V1 closed group	4 years ago
MediaPreviewActivity.java	clean logging	4 years ago
MessageDetailsActivity.java	hook up sending pipeline & clean	4 years ago
MessageDetailsRecipientAdapter.java	make things compile	4 years ago
MuteDialog.java	…
PassphrasePromptActivity.java	clean logging	4 years ago
PassphraseRequiredActionBarActivity.java	clean logging	4 years ago
ShareActivity.java	hook up sending pipeline & clean	4 years ago
ShortcutLauncherActivity.java	clean up V1 closed group	4 years ago
Unbindable.java	…