5564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nielsandriesse	7fdec0ad98	Update version number	2020-08-27 15:41:07 +10:00
nielsandriesse	6139e81799	Update comment	2020-08-27 15:38:47 +10:00
Niels Andriesse	0234ddfd72	Merge pull request #298 from loki-project/photo-sending-bug ... Fix Attachment Upload Retrying	2020-08-27 15:29:18 +10:00
Niels Andriesse	a95af86796	Merge pull request #304 from RyanRory/open-group-message-order ... Fix Open Group Message Ordering	2020-08-27 15:29:03 +10:00
Ryan ZHAO	3b84448d38	fix issues	2020-08-27 14:25:13 +10:00
nielsandriesse	019af3e7ee	Clean	2020-08-27 11:16:39 +10:00
Ryan ZHAO	f80e7e169b	use server timestamp to sort the open group messages	2020-08-27 10:49:15 +10:00
nielsandriesse	d976861cb9	Merge branch 'dev' into photo-sending-bug	2020-08-27 09:36:01 +10:00
Niels Andriesse	a31c58a25a	Merge pull request #301 from metaphore/media-send-emoji-panel-fix ... Fix MediaSendActivity Crash	2020-08-27 09:32:30 +10:00
nielsandriesse	22f48a22cc	Update translations	2020-08-27 09:09:02 +10:00
Niels Andriesse	d2f053aeec	Merge pull request #299 from Bilb/minor-string-fixes ... Improved Russian Translation & Reduced Minimum Closed Group Size	2020-08-27 09:04:54 +10:00
Anton Chekulaev	c8677a904c	Fixed emoji keyboard on media send activity crashes the app.	2020-08-26 13:50:42 +10:00
Audric Ackermann	8184fccb8e	make minimum group members count 1 rather than 2	2020-08-26 11:49:19 +10:00
Audric Ackermann	6162a8d679	update russian translation	2020-08-26 11:48:59 +10:00
nielsandriesse	b7a2de3572	Let AttachmentUploadJob handle retrying ... This way we can better handle e.g. authorization issues	2020-08-26 10:42:22 +10:00
Niels Andriesse	71f338430e	Merge pull request #297 from loki-project/photo-sending-bug ... Fix Attachment Download Retrying	2020-08-26 09:01:05 +10:00
nielsandriesse	9426d095e6	Clean up AttachmentDownloadJob	2020-08-25 15:24:08 +10:00
Niels Andriesse	7a7dc6f553	Merge pull request #296 from RyanRory/fix-closed-group-disappearing-message ... Fix closed group disappearing message	2020-08-25 13:32:05 +10:00
Ryan ZHAO	73ae18feac	fix if iOS sets an expire timer in a closed group, it gets turned off when Android sends a message	2020-08-25 12:02:14 +10:00
nielsandriesse	c43609ff7e	Update build number	2020-08-25 11:14:34 +10:00
nielsandriesse	e6ab67ea4c	Update version number	2020-08-24 16:18:43 +10:00
nielsandriesse	927fcb84ac	Minor refactoring	2020-08-24 15:38:29 +10:00
Niels Andriesse	07d26756ca	Merge pull request #288 from RyanRory/restoration-fix ... Fix Restoration From Seed	2020-08-24 15:36:21 +10:00
nielsandriesse	4d7b179008	Minor refactoring	2020-08-24 14:47:28 +10:00
Niels Andriesse	4cc22608aa	Merge pull request #295 from metaphore/patch-1 ... Fix ContactSelectionListFragment Loader Usage	2020-08-24 14:34:01 +10:00
Anton Chekulaev	61b3cca246	Missed import.	2020-08-24 11:46:50 +10:00
Anton Chekulaev	59b94a1744	Update ContactSelectionListFragment.kt ... Manual loader destruction and logging for the loader callback activity check.	2020-08-24 11:43:09 +10:00
Ryan ZHAO	aed2941da7	show session reset done message	2020-08-24 11:41:39 +10:00
Ryan ZHAO	16e93f6356	update info message when reset the session	2020-08-24 10:45:33 +10:00
nielsandriesse	72999c7d12	Hopefully fix crash	2020-08-24 09:11:48 +10:00
Ryan ZHAO	8a125244f6	Merge branch 'dev' of https://github.com/loki-project/session-android into restoration-fix	2020-08-21 15:42:24 +10:00
Ryan ZHAO	f18d5a3b82	ignore session request before restoration & Automatically rebuild session after restoration	2020-08-21 15:40:19 +10:00
Ryan ZHAO	cb5e82ac84	fix session request sent timestamp data type from DB	2020-08-21 15:39:45 +10:00
Ryan ZHAO	ad5b2eceb7	Don't show error messages before restoration	2020-08-21 15:39:13 +10:00
nielsandriesse	457c4b75c9	Update version number	2020-08-21 14:24:32 +10:00
nielsandriesse	1a013e9a19	Patch bad mac issues	2020-08-21 14:23:23 +10:00
nielsandriesse	1a8ced90a8	Fix inverted placeholder	2020-08-21 12:03:40 +10:00
nielsandriesse	82fb950956	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2020-08-21 10:36:20 +10:00
nielsandriesse	7ac94089a2	Integrate improved Persian translation	2020-08-21 10:35:32 +10:00
nielsandriesse	aadbe470ae	Re-enable Persian translation	2020-08-21 10:31:46 +10:00
Niels Andriesse	b9b78241f7	Merge pull request #287 from Brice-W/french-updates ... Improved French Translation	2020-08-21 10:01:52 +10:00
Brice	1865871b0c	french labels updaed	2020-08-21 09:56:01 +10:00
nielsandriesse	0f733bee51	Update build number	2020-08-20 10:38:05 +10:00
nielsandriesse	7e99aec410	Fix messed up database table	2020-08-20 10:32:31 +10:00
nielsandriesse	86fa15d0c9	Update build number	2020-08-20 09:26:33 +10:00
nielsandriesse	af1f45a6e4	Fix received message hash values storage	2020-08-20 09:19:00 +10:00
nielsandriesse	a4c6b39ffa	Update build number	2020-08-19 16:33:51 +10:00
nielsandriesse	cc6c6dab3d	Fix legacy closed group messaging	2020-08-19 16:32:15 +10:00
nielsandriesse	39792ef7f9	Fix SSK based closed group updating copy	2020-08-19 15:31:35 +10:00
nielsandriesse	fa664d0725	Attempt to fix key store crash	2020-08-19 14:31:56 +10:00