Commit Graph

1094 Commits

Author SHA1 Message Date
Niels Andriesse
7f1af51013 Update unread message count on scroll 2021-06-25 10:02:59 +10:00
jubb
4a8c5f5946 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-25 09:58:07 +10:00
jubb
620d063194 feat: adding text and shade, reverting other components to use old ThumbnailView 2021-06-25 09:57:58 +10:00
Niels Andriesse
a7e5ff1ce2 Mark all messages as read upon opening a conversation 2021-06-25 09:44:27 +10:00
Niels Andriesse
2a06904d76 Scroll to first unread message upon opening a conversation 2021-06-25 09:38:26 +10:00
Niels Andriesse
ec9df3adb2 Fix crash & add documentation 2021-06-25 09:19:21 +10:00
Niels Andriesse
2132e53fb0 Hook up cancel link preview draft button 2021-06-24 16:30:16 +10:00
jubb
b5f41b4383 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
2021-06-24 16:26:45 +10:00
jubb
110391c2cd refactor: move new thumbnailview to utilities package 2021-06-24 16:25:43 +10:00
Niels Andriesse
fe8b0c9798 Create link preview draft view 2021-06-24 16:23:37 +10:00
jubb
277c741851 feat: AlbumThumbnailView.kt view visible and binding to thumbnail slides 2021-06-24 16:15:13 +10:00
Niels Andriesse
c4bac842dd Observe link preview changes 2021-06-24 15:46:36 +10:00
Niels Andriesse
11c2983f66 Fix typing indicator color 2021-06-24 15:27:00 +10:00
Niels Andriesse
94e436b922 Fix layout bug 2021-06-24 15:20:33 +10:00
Niels Andriesse
dabe26a1c9 Highlight mentions 2021-06-24 15:17:12 +10:00
Niels Andriesse
32c2762d06 Make link preview view use thumbnail 2021-06-24 15:03:29 +10:00
Niels Andriesse
2082a58e5a Clean 2021-06-24 14:26:38 +10:00
Niels Andriesse
c0429569db Add blocked banner 2021-06-24 14:21:05 +10:00
Niels Andriesse
ec8d4c9f5d Large emojis 2021-06-24 14:13:36 +10:00
Niels Andriesse
06b9c30c27 Add trust dialog 2021-06-24 14:05:55 +10:00
Niels Andriesse
d763fa00d3 Add link preview dialog 2021-06-24 13:59:53 +10:00
Niels Andriesse
250fb50cc8 Add open URL dialog 2021-06-24 13:54:34 +10:00
Niels Andriesse
058319c9c7 Add join open group dialog 2021-06-24 13:47:24 +10:00
Niels Andriesse
7373918d3d Add blocked dialog 2021-06-24 13:38:59 +10:00
Niels Andriesse
1dc7f7e9c0 Make dialogs look better 2021-06-24 13:14:18 +10:00
Niels Andriesse
ed5641df03 Fetch latest open group member count when opening a conversation 2021-06-24 11:43:51 +10:00
Niels Andriesse
e4292a3db5 Add action bar subtitle 2021-06-24 11:38:06 +10:00
Niels Andriesse
62cee715a7 Add documentation 2021-06-24 11:24:25 +10:00
Niels Andriesse
38710814e2 Show typing indicators 2021-06-24 11:22:32 +10:00
Niels Andriesse
f66309afd8 Add unread count to conversation view 2021-06-24 10:18:52 +10:00
Niels Andriesse
201b8c8e68 Add unread count to scroll to bottom button 2021-06-24 10:04:43 +10:00
jubb
19f2546d81 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-24 09:43:28 +10:00
Niels Andriesse
311a298c0c Debug 2021-06-24 09:34:16 +10:00
jubb
3c07f8b622 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-23 16:57:04 +10:00
Niels Andriesse
1b6ddc0c0b Hook up scroll button 2021-06-23 16:08:30 +10:00
Niels Andriesse
6533fdb64b Add scroll to bottom button 2021-06-23 15:14:19 +10:00
jubb
313fe2f62c Merge remote-tracking branch 'upstream/ui' into ui 2021-06-23 14:59:46 +10:00
Niels Andriesse
75d58677e4 Add scroll to bottom button plumming 2021-06-23 14:48:29 +10:00
Niels Andriesse
74697b0be7 Linkify URLs 2021-06-23 14:08:17 +10:00
Niels Andriesse
c181dfec81 Clean & add documentation 2021-06-23 13:57:13 +10:00
Niels Andriesse
ca98a24839 Debug 2021-06-23 13:39:24 +10:00
jubb
d48f68afc2 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-06-23 13:18:00 +10:00
Niels Andriesse
d2d13ec696 Re-add open group guidelines 2021-06-23 13:11:21 +10:00
jubb
e62785ecae feat: set visible thread to prevent notifications in ConversationActivityV2.kt 2021-06-23 11:54:17 +10:00
Niels Andriesse
0291171fb8 Fix quote view sizing 2021-06-23 11:32:05 +10:00
jubb
1ba12c40cc feat: also adjust clear all button to be delete / clear network depending on step 2021-06-23 10:29:17 +10:00
Niels Andriesse
da0ed31f9b Merge branch 'dev' of github.com:oxen-io/session-android into ui 2021-06-23 09:25:56 +10:00
jubb
1df6fa46a4 feat: clear all data dialog with local and network only options 2021-06-22 17:01:27 +10:00
Niels Andriesse
edb0763060 Fix group message layout & handle profile pictures 2021-06-22 16:42:53 +10:00
Niels Andriesse
e674f70155 Drafts 2021-06-22 16:23:47 +10:00
Niels Andriesse
1c92b17ecc Handle open group invitation weirdness & fix quote view sizing 2021-06-22 15:55:32 +10:00
Niels Andriesse
b2a66e9293 Add message status indicator 2021-06-22 15:41:14 +10:00
Niels Andriesse
b8f6321262 Basic open group invitation view 2021-06-22 10:39:34 +10:00
Niels Andriesse
252f344d93 Fix link preview corner rounding 2021-06-22 09:34:23 +10:00
Niels Andriesse
74330c931a WIP 2021-06-21 16:13:21 +10:00
jubb
05b0e5f308 feat: handling responses and using new updated params 2021-06-21 15:48:42 +10:00
Niels Andriesse
0eaecf168d Basic link preview view 2021-06-21 15:26:09 +10:00
Niels Andriesse
ae078d8ee9 Fix gestures interfering with eachother 2021-06-21 14:48:27 +10:00
Niels Andriesse
48df733773 Basic quote view attachment handling 2021-06-21 14:24:00 +10:00
Niels Andriesse
517539a837 Fix cell re-use issue 2021-06-21 14:00:48 +10:00
Niels Andriesse
f79bb5e0d4 Add document view 2021-06-21 13:58:01 +10:00
Niels Andriesse
6ddde26496 Minor tweaks 2021-06-21 13:43:49 +10:00
Niels Andriesse
6d9eb0a932 Full voice message UI 2021-06-21 13:36:45 +10:00
Niels Andriesse
ac718a425d Basic voice message 2021-06-21 11:09:30 +10:00
Niels Andriesse
ce5f923b25 Adapt quote view for use in messages 2021-06-21 10:53:52 +10:00
Niels Andriesse
84fa6cdcb6 Fix layout issue 2021-06-21 09:45:09 +10:00
Niels Andriesse
aadbe2fdd0 Fix swipe to reply bug 2021-06-21 09:40:23 +10:00
Niels Andriesse
2aaacbd029 Debug 2021-06-18 16:24:56 +10:00
Niels Andriesse
9471db76c2 Fix height change handling 2021-06-18 16:04:22 +10:00
jubb
fdc042e6d4 feat: testnet clearing network data on delete and differentiating dialogs 2021-06-18 16:01:34 +10:00
Niels Andriesse
123cd6d486 Handle text only quote drafts 2021-06-18 15:54:24 +10:00
Niels Andriesse
9419bafe93 Add preliminary quote draft view 2021-06-18 15:11:41 +10:00
Niels Andriesse
be158eccc1 Animate the mention candidates view 2021-06-18 11:05:14 +10:00
Niels Andriesse
efc752e3a1 Add mention candidates view 2021-06-18 11:00:52 +10:00
Niels Andriesse
7c3b1b22d7 Move attachment options as input bar expands 2021-06-18 10:16:15 +10:00
Niels Andriesse
a5bf1a3c66 Remaining input bar animation 2021-06-18 09:51:44 +10:00
Harris
11f64a1d1a feat: add snode method delete_all with data class for params, refactoring ClearAllDataDialog.kt to handle async requests better and prevent ANR 2021-06-17 18:29:05 +10:00
Niels Andriesse
f4621a4fee More animation 2021-06-17 16:29:57 +10:00
Niels Andriesse
b5376cd60e Handle voice message recording view hiding 2021-06-17 16:07:11 +10:00
Niels Andriesse
b7000aa58b Tweak UI 2021-06-17 15:20:19 +10:00
Niels Andriesse
5a2baae15d Clean 2021-06-17 14:57:47 +10:00
Niels Andriesse
092dad03b7 Add expanding attachment buttons 2021-06-17 14:34:50 +10:00
Niels Andriesse
4855f694e7 More UI 2021-06-17 14:01:43 +10:00
Niels Andriesse
7b68d63534 Animate voice message lock view 2021-06-17 13:18:09 +10:00
Niels Andriesse
8f2ccf9e70 Add voice message lock view 2021-06-17 11:24:54 +10:00
Niels Andriesse
7cacee8499 More animation 2021-06-17 10:53:56 +10:00
Niels Andriesse
ac4b576abe
Merge pull request #606 from Brice-W/fix-illegalstateexception
Fix IllegalStateException
2021-06-17 09:32:44 +10:00
Brice-W
9af804ec21 don't close the cursor if it's the same that is in the parameters 2021-06-16 16:43:33 +10:00
Harris
b0dab208d2 feat: extracting more strings, replacing link device strings using existing activities in case they change in future 2021-06-16 16:14:06 +10:00
Harris
5ce28f976b feat: extracting QR related strings and other github mentioned strings 2021-06-16 16:05:08 +10:00
Niels Andriesse
4587f40128 Fix indentation 2021-06-16 15:54:55 +10:00
Niels Andriesse
bcd5d1cb0d Merge branch 'dev' of github.com:oxen-io/session-android into ui 2021-06-16 15:54:24 +10:00
Niels Andriesse
c831c8a31b More animation 2021-06-16 15:54:00 +10:00
Niels Andriesse
bdc5a0e5d9 Add animation 2021-06-16 15:49:39 +10:00
Niels Andriesse
5ae201b81b Add basic voice message recording UI 2021-06-16 14:50:41 +10:00
Harris
99fbf26907 feat: removing the QR code on visibility hint no longer visible 2021-06-16 14:25:33 +10:00
Niels Andriesse
bf25a44f7b Minor tweaks 2021-06-16 11:21:58 +10:00
Niels Andriesse
c6cadf8d35 Tweak long press vs scroll gesture handling 2021-06-16 10:59:56 +10:00
Niels Andriesse
eac0a87e40 Add send button 2021-06-16 10:39:24 +10:00
Niels Andriesse
2188200717 Merge branch 'dev' into ui 2021-06-16 10:19:52 +10:00
Niels Andriesse
871bafe66d Debug 2021-06-16 09:51:50 +10:00
Brice-W
8837256276 delete listener if current user is admin 2021-06-15 17:21:24 +10:00
Niels Andriesse
196fc25902 Make input edit text grow dynamically 2021-06-15 16:14:35 +10:00
Niels Andriesse
e06a3271df Add basic input edit text 2021-06-15 14:55:57 +10:00
Niels Andriesse
bb5f8e007d Clean 2021-06-15 14:15:22 +10:00
Niels Andriesse
5755f4150a Implement InputBarButton 2021-06-15 14:05:32 +10:00
Niels Andriesse
acc472bbad Add ripple 2021-06-15 13:01:05 +10:00
Niels Andriesse
61e44dcb59 WIP 2021-06-15 11:34:50 +10:00
Brice-W
47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse
f8ea8cbd03 Implement placeholder input bar layout 2021-06-15 09:42:18 +10:00
Niels Andriesse
7c659c9a68 Make room for input bar 2021-06-15 09:24:20 +10:00
Niels Andriesse
ed6db6f4e7 Merge branch 'dev' into ui 2021-06-11 13:41:50 +10:00
Brice-W
b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Niels Andriesse
c79b9e3397 Clean 2021-06-10 14:24:18 +10:00
Niels Andriesse
c69d66e6a4 Fix scrolling 2021-06-10 11:37:24 +10:00
Niels Andriesse
d7204ff921 Debug 2021-06-10 10:55:27 +10:00
Niels Andriesse
1c5721db82 Don't move date break header 2021-06-10 10:54:26 +10:00
Niels Andriesse
e87d22d62b Fix drawable state sharing 2021-06-10 10:39:15 +10:00
Niels Andriesse
2ef1f83e6d Fix clipping 2021-06-10 10:18:37 +10:00
Niels Andriesse
bf24b84840 Fix animation glitch 2021-06-10 10:04:50 +10:00
Harris
3c1b0ff1e1 feat: extract upgrade to HomeActivity.kt resume instead of access 2021-06-09 15:56:20 +10:00
Niels Andriesse
e61c3288fa Swipe to reply icon 2021-06-09 15:12:48 +10:00
Brice-W
3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Niels Andriesse
7a44c27936 Ignore swipe on selected message 2021-06-09 12:04:50 +10:00
Niels Andriesse
2988ac8b7a Re-introduce regular press 2021-06-09 11:37:50 +10:00
Harris
645bf66424 feat: only FORCE upgrade if not upgraded yet 2021-06-09 11:31:45 +10:00
Niels Andriesse
61588332a6 Re-introduce long press 2021-06-09 11:18:15 +10:00
Niels Andriesse
834ac1106b Implement better swipe to reply gesture 2021-06-09 10:57:40 +10:00
Harris
11b44a5dde feat: force upgrade on check if identity key exists 2021-06-09 10:35:24 +10:00
nielsandriesse
fed95ce784 Add TODOs 2021-06-08 15:29:02 +10:00
nielsandriesse
3820b07ad8 Show message timestamp on select 2021-06-08 14:06:16 +10:00
Harris
51061cac0e Merge remote-tracking branch 'upstream/dev' into identity_key_encryption 2021-06-08 11:53:38 +10:00
nielsandriesse
411a0dee6f Update build number 2021-06-08 08:38:43 +10:00
nielsandriesse
9568a907fe Clean 2021-06-07 16:43:54 +10:00
nielsandriesse
5761ce959b Fix layout issue 2021-06-07 16:36:05 +10:00
nielsandriesse
7e6cd7c86f Add date breaks 2021-06-07 16:06:37 +10:00
nielsandriesse
2b21f199ea Apply message corner radii 2021-06-07 15:48:22 +10:00
nielsandriesse
34522ede95 Apply inter-message spacing 2021-06-07 15:37:21 +10:00
Harris
f10a99ce41 fix: don't put encrypted in encrypted 2021-06-07 15:23:20 +10:00
nielsandriesse
e1345a8774 Implement conversation item context menu interaction 2021-06-07 14:04:55 +10:00
Harris
596b02cfaf fix: don't double encrypt on save 2021-06-07 12:00:21 +10:00
Harris
91aefb7c87 feat: upgrade to keystore sealed identity key preferences 2021-06-07 11:53:17 +10:00
nielsandriesse
4ecfd1f230 Re-implement conversation item context menu 2021-06-07 11:37:20 +10:00
nielsandriesse
c0d80d68df Clean 2021-06-07 10:39:22 +10:00
nielsandriesse
d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
Niels Andriesse
7ea399b55d
Merge pull request #525 from Brice-W/zombie-handling-update
Closed Group Fixes
2021-06-04 16:26:53 +10:00
nielsandriesse
3a4ab06df4 Implement basic action mode menu 2021-06-04 15:10:58 +10:00
nielsandriesse
36ba931402 Refactor conversation screen action bar setup 2021-06-04 14:55:53 +10:00
nielsandriesse
db09a50995 Fix animation glitch 2021-06-04 14:27:25 +10:00
nielsandriesse
e0809e5eda Add swipe to reply icon 2021-06-04 14:21:08 +10:00
nielsandriesse
37a0263670 Implement swipe to reply gesture 2021-06-04 13:15:43 +10:00
Brice-W
1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
nielsandriesse
10ec35bd74 Fix conversation updating & stack messages from end 2021-06-04 09:58:04 +10:00
nielsandriesse
f4ca2f2726 Merge branch 'dev' into ui 2021-06-04 08:40:55 +10:00
nielsandriesse
d09d6aa0a7 Update version number 2021-06-04 08:38:55 +10:00
nielsandriesse
051dc698d7 Fix German translation 2021-06-04 08:37:30 +10:00
nielsandriesse
7b930ad08f Update translations 2021-06-04 08:35:38 +10:00
Brice-W
807e1042ca make update messages not selectable 2021-06-03 14:43:23 +10:00
Brice-W
2c7730260d fix case where closed group was impossible to delete 2021-06-03 14:08:13 +10:00
nielsandriesse
9a0e5e7b6c Make room for triple dot menu 2021-06-02 13:28:02 +10:00
nielsandriesse
9397f02272 Add missing bind(_:) calls 2021-06-02 13:14:36 +10:00
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
43fbc3de55 Clean up create private chat screen 2021-06-02 11:34:30 +10:00
nielsandriesse
9888f23789 Fix ugly color 2021-06-02 11:00:40 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse
23100962e3 Clean 2021-06-02 10:12:49 +10:00
nielsandriesse
19550f7be9 Merge branch 'dev' into ui 2021-06-02 10:00:36 +10:00
nielsandriesse
86ccc3767e Update translations 2021-06-02 09:53:02 +10:00
nielsandriesse
8b084c89b9 Implement conversation activity toolbar 2021-06-01 16:17:14 +10:00
nielsandriesse
dc4a7d0761 Apply correct message bubble margins 2021-06-01 15:43:37 +10:00
nielsandriesse
958cd54b75 Stub views for different message types 2021-06-01 14:56:58 +10:00
nielsandriesse
3b18b0985b Add date break header 2021-06-01 14:38:52 +10:00
nielsandriesse
e177fc4689 Fix outgoing message layout 2021-06-01 14:28:14 +10:00
nielsandriesse
7f3b714401 Add VisibleMessageContentView 2021-06-01 13:26:57 +10:00
nielsandriesse
a23cfbc11d Implement parts of the visible message view 2021-06-01 13:01:03 +10:00
nielsandriesse
d20f81bd2e Merge branch 'dev' into ui 2021-06-01 10:08:10 +10:00
nielsandriesse
d3776ae0e6 Enable data extraction notifications 2021-06-01 10:07:37 +10:00
nielsandriesse
b000be9037 Add isControlMessage convenience variable 2021-06-01 10:02:20 +10:00
nielsandriesse
7710a2c32f Distinguish between control messages and visible messages 2021-06-01 09:48:02 +10:00
nielsandriesse
7ab9d3d8dc Clean remaining message record classes 2021-05-31 16:26:46 +10:00
nielsandriesse
7e9116df9c Clean up MessageRecord 2021-05-31 16:20:46 +10:00
nielsandriesse
1952b0e3be Clean up DisplayRecord 2021-05-31 15:53:25 +10:00
nielsandriesse
7ca940c6aa Merge branch 'dev' into ui 2021-05-31 14:52:12 +10:00
nielsandriesse
b8a85c35c4 Update version number 2021-05-31 14:31:36 +10:00
nielsandriesse
502d485235 Hook up message body 2021-05-31 14:29:11 +10:00
nielsandriesse
b346a85d57 Add basic conversation screen components 2021-05-31 14:06:02 +10:00
nielsandriesse
1e1e3bf0e8 Update version number 2021-05-31 13:13:50 +10:00
nielsandriesse
e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00
Niels Andriesse
b9e2b665e8
Merge pull request #586 from iArchitSharma/patch-2
Full Hindi Translation
2021-05-31 08:24:46 +10:00
Archit Sharma
f2a8d50a4d
All Hindi Translation done 2021-05-28 19:56:20 +07:00
nielsandriesse
1262f80a1f Clean up ProfilePictureView 2021-05-28 16:09:15 +10:00
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao
a81c17057f Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-28 11:22:58 +10:00
ryanzhao
497405fe50 clean 2021-05-28 11:22:46 +10:00
ryanzhao
c0d4dd741c debug 2021-05-28 11:22:06 +10:00
nielsandriesse
0ef576da73 Update version number 2021-05-28 11:02:55 +10:00
Ryan ZHAO
a66d2c97e0 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 16:52:12 +10:00
Ryan ZHAO
93dfbcaae2 clean 2021-05-27 16:51:59 +10:00
Niels Andriesse
193454beec Update build number 2021-05-27 16:19:20 +10:00
Niels Andriesse
bd9db0d248
Merge pull request #521 from hjubb/storage_access_warning
Don't Use Legacy External Storage
2021-05-27 16:18:10 +10:00
Niels Andriesse
e71760d08f Update build number 2021-05-27 16:08:13 +10:00
Niels Andriesse
ed87961850
Merge pull request #568 from hjubb/improve_background_jobs
More Efficient Thread Trimming & Database Cleanup
2021-05-27 16:04:47 +10:00
jubb
72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
jubb
bcff8af159 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-27 15:43:59 +10:00
Niels Andriesse
5d262a4bba Update version number 2021-05-27 15:43:44 +10:00
Niels Andriesse
49ee9b9991 Delete unnecessary transaction 2021-05-27 15:39:46 +10:00
Ryan ZHAO
0e89d88459 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 15:32:00 +10:00
Ryan ZHAO
e6cdd3ee0e add logic and UI in create private chat view 2021-05-27 15:31:48 +10:00
Niels Andriesse
85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
jubb
468b8f25c5 refactor: improve docs 2021-05-27 11:06:47 +10:00
jubb
e389044f25 refactor: remove test logs 2021-05-27 11:05:47 +10:00
jubb
ea9592a6a5 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-27 11:02:46 +10:00
jubb
6fd1a82bed Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-26 15:22:38 +10:00
jubb
efa36d4cea refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message
migrate TrimThreadJob.kt to new job system

deleting more open group references in removal

open group last message / last deletion now sets after processing vs after fetching
2021-05-26 15:22:19 +10:00
Niels Andriesse
ad51bbb847 Update open group guidelines 2021-05-25 16:24:37 +10:00
Niels Andriesse
02bbd3b8bf Clean up onboarding 2021-05-25 11:48:59 +10:00
Niels Andriesse
9fa3e37e68 Update build number 2021-05-25 09:17:28 +10:00
Niels Andriesse
128116ec36 Fix crash 2021-05-25 09:17:06 +10:00
Niels Andriesse
5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse
ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse
dfce9d636a Update build number 2021-05-24 16:10:51 +10:00
Niels Andriesse
e674e40959 Experimental performance improvement 2021-05-24 16:10:27 +10:00
Niels Andriesse
550d8b61c7 Quick fix crash 2021-05-24 15:31:46 +10:00
ryanzhao
25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse
5353e124df Update translations 2021-05-24 14:46:28 +10:00
Niels Andriesse
2a0a5a2326 Fix case 2021-05-24 14:33:10 +10:00
Niels Andriesse
08a2295f16
Merge pull request #562 from hjubb/pubkey_validation_on_open_group
Validate Public Key When Adding Open Group
2021-05-24 14:32:18 +10:00
jubb
4f84b976c5 fix: return error early if the public key is not expected length or format with an appropriate message 2021-05-24 14:01:20 +10:00
Niels Andriesse
639146cc0a Simplify & fix from_server_id usage 2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac Merge branch 'dev' into polling-limit 2021-05-24 13:37:13 +10:00
Niels Andriesse
95657195e6 Update build number 2021-05-24 13:24:35 +10:00
Brice-W
2969d4b161 clean 2021-05-24 13:14:37 +10:00
Brice-W
6c37e7a93f move logic from Storage to OpenGroupAPIV2 2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 12:58:35 +10:00
Niels Andriesse
f64fb68e96
Merge branch 'dev' into fix_hardcoded_strings 2021-05-24 12:52:10 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames
Nicknames
2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda Fix open group display name handling 2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a implementation of polling limit on open groups 2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8 Add contacts migration 2021-05-24 11:35:05 +10:00
Niels Andriesse
04b62df83c Make user details bottom sheet look better 2021-05-24 11:08:08 +10:00
jubb
43b297b334 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-24 10:34:47 +10:00
Niels Andriesse
e7ae08fe7a Clean 2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 09:19:56 +10:00
Niels Andriesse
051dbbfef9 Update version number 2021-05-24 08:54:38 +10:00
jubb
7c7ace9ecd refactor: extract hardcoded strings
allows fix for #529
2021-05-21 16:49:06 +10:00
Niels Andriesse
dfd3ccc5d2 Clean 2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00