Commit Graph

3770 Commits

Author SHA1 Message Date
Ryan ZHAO
bf272787fe Merge branch 'dev' of https://github.com/loki-project/session-android into attachment-in-conversation-preview 2020-09-03 14:41:09 +10:00
Ryan ZHAO
f42855f43e show attachment emoji in conversation previews 2020-09-03 14:41:00 +10:00
Niels Andriesse
cac5bd1834
Merge pull request #316 from RyanRory/open-group-duplicated-messages
Fix Duplicated Open Group Messages
2020-09-03 14:37:50 +10:00
Anton Chekulaev
79086e41fc Do not treat SVGs as regular images. 2020-09-03 13:27:02 +10:00
Ryan ZHAO
4a740780ca Merge branch 'dev' of https://github.com/loki-project/session-android into attachment-in-conversation-preview 2020-09-03 13:17:03 +10:00
Ryan ZHAO
74378a88ab fix duplicated sent messages in open groups 2020-09-03 13:14:26 +10:00
Niels Andriesse
0da8613075
Merge pull request #313 from metaphore/light-theme
Light Theme Tweaks
2020-09-03 11:42:33 +10:00
nielsandriesse
d6f780eb79 Revert "Fix file storage"
This reverts commit c9e686551f.
2020-09-03 11:37:35 +10:00
Anton Chekulaev
5d6b23bae2 Light theme feature intro bottom sheet is expanded by default. 2020-09-03 11:34:49 +10:00
nielsandriesse
eb1f050a01 Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2020-09-03 10:27:38 +10:00
nielsandriesse
c9e686551f Fix file storage 2020-09-03 10:27:00 +10:00
Niels Andriesse
a02e1c5eff
Merge pull request #312 from loki-project/multidex
Disable Multi Dex
2020-09-03 10:23:28 +10:00
nielsandriesse
4661e7b4ca Disable multi dex 2020-09-03 09:18:33 +10:00
Anton Chekulaev
de93b6669e Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme
# Conflicts:
#	res/values/strings.xml
2020-09-02 23:47:31 +10:00
Anton Chekulaev
00e60d86ae White "plus" home screen icon. 2020-09-02 21:35:23 +10:00
Anton Chekulaev
d89074c694 Dynamic UI mode menu icon. 2020-09-02 21:09:38 +10:00
Ryan ZHAO
c0d5c22a21 WIP: show attachment in conversation preview as iOS 2020-09-02 16:59:52 +10:00
nielsandriesse
837ca48cde Minor refactoring 2020-09-02 16:14:57 +10:00
Niels Andriesse
2866bdd0f1
Merge pull request #311 from RyanRory/open-group-missing-messages
Fix Missing Messages in Open Groups
2020-09-02 16:13:15 +10:00
nielsandriesse
906deb3ada Add copy Session ID button for one-to-one chats 2020-09-02 16:03:23 +10:00
Ryan ZHAO
cf49bf81fc fix missing messages in open groups 2020-09-02 14:44:15 +10:00
Anton Chekulaev
2e31900957 Merge branch 'dev' into light-theme
# Conflicts:
#	res/layout/activity_create_closed_group.xml
2020-09-02 13:33:16 +10:00
Anton Chekulaev
33876c2fc9 Use localized strings for UI mode dialog. 2020-09-02 13:24:02 +10:00
Anton Chekulaev
4b939358e9 Themes & styles cleanup. 2020-09-02 12:47:56 +10:00
Niels Andriesse
8e6920f37e
Merge pull request #309 from loki-project/shared-sender-keys
Remaining Shared Sender Keys Bits & Pieces Part 1/2
2020-09-02 12:06:03 +10:00
nielsandriesse
154181f518 Fix group leaving 2020-09-02 12:03:15 +10:00
Anton Chekulaev
4a39fe9588 Conversation activity theme tweaks. 2020-09-02 11:55:01 +10:00
nielsandriesse
2732b95940 Show a loader while the group is being created 2020-09-02 11:47:54 +10:00
Niels Andriesse
9865bdeece
Merge pull request #310 from RyanRory/open-group-date-handling
Fix Open Group Date Handling
2020-09-02 10:59:40 +10:00
nielsandriesse
146df2c5ef Fix incorrect database query 2020-09-02 10:22:19 +10:00
nielsandriesse
239efa7fc2 Merge branch 'dev' into shared-sender-keys 2020-09-02 09:49:19 +10:00
Anton Chekulaev
0992ad4e5b Outlined icons for conversation input panel. 2020-09-01 19:22:30 +10:00
nielsandriesse
fcc6304247 Fix path rebuilding 2020-09-01 18:30:54 +10:00
nielsandriesse
d26712bdb4 Slightly reduce background poll interval 2020-09-01 17:02:08 +10:00
Anton Chekulaev
156b2687b8 Better brand button style for the light mode.
QR code fragment themed.
Minor adjustments to the brand colors for light mode.
2020-09-01 16:58:30 +10:00
nielsandriesse
ef509d3c58 Show build number in app settings 2020-09-01 16:27:10 +10:00
nielsandriesse
968177c012 Add logs 2020-09-01 10:38:16 +10:00
Ryan ZHAO
c0a8e6991d fix open group date handling 2020-09-01 09:48:14 +10:00
Anton Chekulaev
b05350b5aa Daynight theme for media preview & overview activities. 2020-08-31 23:16:15 +10:00
Anton Chekulaev
4da13f8541 Merge remote-tracking branch 'loki/master' into light-theme 2020-08-31 19:54:47 +10:00
Anton Chekulaev
12f509c07e Merge remote-tracking branch 'loki/master' into thumbnail-attach-loading-indicator 2020-08-31 19:48:10 +10:00
Anton Chekulaev
7cc67daf80 DB attachment record gets properly updated on upload error.
Individual loading indicators per conversation item thumbnail.
2020-08-31 19:46:05 +10:00
nielsandriesse
e7b2e3a223 Debug 2020-08-31 16:03:46 +10:00
nielsandriesse
5957afa147 Debug SSK based closed group editing 2020-08-31 14:54:03 +10:00
nielsandriesse
52f50e3252 Fix SSK based closed group size inconsistency 2020-08-31 13:53:31 +10:00
nielsandriesse
e391ad8edd Fix attachment upload retrying 2020-08-31 10:47:39 +10:00
Anton Chekulaev
f3bb40e024 Loading indicator for message thumbnail view. 2020-08-28 17:38:19 +10:00
Anton Chekulaev
fe1362187e Use proper file URI for QR code sharing. 2020-08-27 20:53:50 +10:00
Anton Chekulaev
f11478585d Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-27 15:51:54 +10:00
Anton Chekulaev
9d0d2cb07e Light theme feature intro bottom sheet. 2020-08-27 15:50:35 +10:00