3842 Commits

Author SHA1 Message Date
nielsandriesse
e003df79d8 Fix session reset bug 2020-09-03 15:20:16 +10:00
Ryan ZHAO
d575867d6b show attachment emoji in notification 2020-09-03 15:07:59 +10:00
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 c9e686551f1558ae1c8ac87905260958cadd2ad3.
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
nielsandriesse
8705d8675b Update comment 2020-08-27 15:49:16 +10:00
Niels Andriesse
a0b2f5dfb5
Merge pull request #300 from metaphore/qr-code-share-fix
Fix Share QR Code Crash
2020-08-27 15:47:41 +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
Anton Chekulaev
83a36b327a Use default shared preferences for UI mode utils. 2020-08-27 14:52:57 +10:00
Anton Chekulaev
1cc1afb8bf Settings activity imports cleanup. 2020-08-27 14:38:41 +10:00
Anton Chekulaev
3a6fe98f1f Day/night UI mode settings selector. 2020-08-27 14:38:25 +10:00
Ryan ZHAO
3b84448d38 fix issues 2020-08-27 14:25:13 +10:00
Anton Chekulaev
4f97989154 Fixed status bar styling for lollipop devices.
Simplified ic_circle_plus drawable.
2020-08-27 12:30:27 +10:00
nielsandriesse
019af3e7ee Clean 2020-08-27 11:16:39 +10:00
Anton Chekulaev
104fb31ce9 Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-27 11:00:55 +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
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
d930dcd9fa Manual day night switch button for settings activity. 2020-08-26 23:12:01 +10:00
Anton Chekulaev
88efb2c08c Bottom sheet styles were actually fixed. 2020-08-26 22:30:17 +10:00
Anton Chekulaev
2c42bdd1a5 Flat style for the styled Session buttons.
Fixed home activity bottom sheet uses wrong colors.
2020-08-26 22:19:45 +10:00
Anton Chekulaev
81d58dabe6 Theming for giphy activity. 2020-08-26 19:02:40 +10:00
Anton Chekulaev
ce0159f5cc Merge branch 'dev' into light-theme 2020-08-26 15:10:13 +10:00
Anton Chekulaev
c8677a904c Fixed emoji keyboard on media send activity crashes the app. 2020-08-26 13:50:42 +10:00
Anton Chekulaev
c437d69069 Fixed QR code share crashes the app. 2020-08-26 12:47:29 +10:00
Audric Ackermann
8184fccb8e
make minimum group members count 1 rather than 2 2020-08-26 11:49:19 +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
Anton Chekulaev
9f689c56dc Consistent action bar styles. 2020-08-25 23:52:42 +10:00
Anton Chekulaev
724d323125 Share activity complies with day/night configuration. 2020-08-25 20:34:30 +10:00
Anton Chekulaev
2252dea0a1 Better status and navigation bar colors. 2020-08-25 20:21:08 +10:00
Anton Chekulaev
810afe8e7e Theme hierarchy refactoring.
Force dark theme for media send activity.
2020-08-25 19:43:00 +10:00
nielsandriesse
9426d095e6 Clean up AttachmentDownloadJob 2020-08-25 15:24:08 +10:00
Anton Chekulaev
b04028f629 Merge remote-tracking branch 'loki/dev' into light-theme 2020-08-25 15:11:51 +10:00
Anton Chekulaev
47a1cb2a73 Temporary force dark theme for media send activity.
Emoji toggle got themed icons.
2020-08-25 15:08:42 +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
Anton Chekulaev
5e5b88148d Audio view and message bubbles properly themed. 2020-08-24 18:38:48 +10:00
Anton Chekulaev
afe90200f1 Dividers for home screen conversation items.
Themed common/dialog button styles.
2020-08-24 16:46:12 +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
Anton Chekulaev
1191353fde Conversation scroll date label themed.
New muted icon.
2020-08-24 15:33:01 +10:00
nielsandriesse
4d7b179008 Minor refactoring 2020-08-24 14:47:28 +10:00
Anton Chekulaev
9cb0a18a85 Consistent dialog styles. 2020-08-24 14:43:24 +10:00
Anton Chekulaev
fd52fdd042 User view is now compatible with light theme. 2020-08-24 13:34:34 +10:00
Anton Chekulaev
cd32885db6 Conversation menu resources adjusted for light theme support. 2020-08-24 12:52:50 +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
Anton Chekulaev
dcb6dea430 Merge branch 'dev' into light-theme 2020-08-24 11:19:36 +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
Anton Chekulaev
9d7d7689e2 Labeled separator view styling refactoring. 2020-08-21 17:10:49 +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
Anton Chekulaev
a5408fa4f4 Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-21 15:07:57 +10:00
Anton Chekulaev
dd37adee5c Layouts' default background replaced with a proper theme level window background.
Bottom sheet style unified.
2020-08-21 15:06:39 +10:00
nielsandriesse
1a013e9a19 Patch bad mac issues 2020-08-21 14:23:23 +10:00
Anton Chekulaev
fef7154cb4 Conversation input light theme fixes. 2020-08-20 20:36:56 +10:00
Anton Chekulaev
743731eeb0 Old QR code icons replaced with a material lightweight one. 2020-08-20 18:08:10 +10:00
Anton Chekulaev
ec24e3ea4a Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-20 17:49:25 +10:00
Anton Chekulaev
6aaa2dbabd Settings activity toolbar and display name editing refactoring. 2020-08-20 17:48:41 +10:00
Anton Chekulaev
37a3ae9c32 Day theme partially applied. 2020-08-20 16:47:15 +10:00
nielsandriesse
7e99aec410 Fix messed up database table 2020-08-20 10:32:31 +10:00
nielsandriesse
af1f45a6e4 Fix received message hash values storage 2020-08-20 09:19:00 +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
nielsandriesse
c35c08340d Fix delivery receipts 2020-08-19 13:39:02 +10:00
Anton Chekulaev
2f09440355 Merge fixes. 2020-08-19 13:38:49 +10:00
nielsandriesse
e1841db991 Fix crash 2020-08-19 12:15:02 +10:00
nielsandriesse
38464bf1f7 Fix crash 2020-08-19 11:53:04 +10:00
Anton Chekulaev
d30465c6ed Merge branch 'dev' into light-theme 2020-08-19 11:49:49 +10:00
Anton Chekulaev
720afa8fbe Resource and style cleanup. 2020-08-19 11:48:16 +10:00
nielsandriesse
a5abfc2755 Fix crash 2020-08-19 11:40:34 +10:00
nielsandriesse
75881273d5 Fix crash 2020-08-19 11:36:54 +10:00
nielsandriesse
15d7a073f9 Hopefully fix file loading crash 2020-08-19 11:29:52 +10:00
nielsandriesse
96736a8095 Raise deployment target and migrate to AndroidX 2020-08-19 10:06:26 +10:00
nielsandriesse
6e2cbb23cc Exclude existing group members from the add members screen 2020-08-18 15:40:24 +10:00
Niels Andriesse
dadfd17632
Merge pull request #276 from RyanRory/bug-fix
Fix bugs in the Bug Report 1/2
2020-08-18 13:10:24 +10:00
nielsandriesse
43909c3501 Disable member list button 2020-08-18 10:22:21 +10:00
nielsandriesse
f0aa843825 Tweak edit closed group screen layout 2020-08-18 10:05:24 +10:00
nielsandriesse
74dac84796 Implement remaining feedback 2020-08-18 09:34:22 +10:00
nielsandriesse
fdec8eae4b Fill in stub 2020-08-18 09:01:55 +10:00
nielsandriesse
5b641f4415 Minor refactoring 2020-08-18 08:55:17 +10:00
nielsandriesse
d2ea5b32bd Merge branch 'dev' into closed-group-editing-2 2020-08-17 15:08:03 +10:00
nielsandriesse
5fb569030a Disable SSKs for now 2020-08-17 14:39:13 +10:00
nielsandriesse
9d9affe4f9 Fix group ID handling 2020-08-17 14:29:24 +10:00
Anton Chekulaev
e4d2e572ca User cannot remove himself from the edit closed group activity. 2020-08-17 12:12:25 +10:00
Anton Chekulaev
b6b5282a51 Edit closed group activity follows the same data validation as create closed group activity. 2020-08-17 11:10:31 +10:00
Anton Chekulaev
64f3bfd41d Closed group protocol stub update method. 2020-08-17 10:53:02 +10:00
Anton Chekulaev
3e05a616ce Edit closed group activity layout refactoring. 2020-08-14 19:26:56 +10:00
Anton Chekulaev
f7923cd8a4 Merge branch 'dev' into editgroup 2020-08-14 17:47:48 +10:00
Anton Chekulaev
f5ff045b5d Select contacts activity cleanup. 2020-08-14 17:08:28 +10:00
Anton Chekulaev
d9599b984a User count validation for edit closed group activity. 2020-08-14 16:48:56 +10:00
Anton Chekulaev
15d463161a Create closed group activity refactoring. 2020-08-14 15:23:06 +10:00
Anton Chekulaev
6664c2baa7 Edit closed group activitiy cleanup. 2020-08-14 14:52:15 +10:00
Anton Chekulaev
f88558a719 Merge branch 'dev' into editgroup 2020-08-13 17:26:45 +10:00
nielsandriesse
865f4b90ad Disable SSKs for now 2020-08-13 10:45:24 +10:00
nielsandriesse
cb1aad425a Fix group leaving 2020-08-13 09:31:04 +10:00