akwizgran
b08b2c691c
Merge branch 'merge-contact-hooks' into 'master'
...
Merge add/remove contact hooks
See merge request akwizgran/briar!761
2018-04-17 16:53:22 +00:00
akwizgran
284e3a2e86
Merge add/remove contact hooks.
2018-04-17 16:20:16 +01:00
akwizgran
95b9b3a3c6
Merge branch 'multiple-transport-keys' into 'master'
...
Support multiple sets of transport keys per contact
See merge request akwizgran/briar!745
2018-04-17 14:02:45 +00:00
Torsten Grote
ede390b897
Merge branch '1180-tor-plugin-status' into 'master'
...
Don't reset Tor connectivity state unless we lose connectivity
Closes #1180
See merge request akwizgran/briar!756
2018-03-30 15:49:20 +00:00
akwizgran
5b790130d4
Don't reset circuit built flag unless network is disabled.
2018-03-30 16:33:03 +01:00
akwizgran
ff44edf714
Merge branch '1171-wifi-access-point' into 'master'
...
Enable LAN plugin when providing a wifi access point
Closes #1171
See merge request akwizgran/briar!752
2018-03-29 15:17:46 +00:00
Torsten Grote
60dffd0998
Update translations, add Romanian
2018-03-29 10:38:01 -03:00
akwizgran
46dae59444
Delay handling of AP enabled event.
2018-03-29 14:34:58 +01:00
Torsten Grote
e385d58148
Merge branch '1190-shutdown-from-background' into 'master'
...
Shut down cleanly when phone is shutting down or memory is low
Closes #1190
See merge request akwizgran/briar!742
2018-03-29 13:29:42 +00:00
akwizgran
b20626935e
AP state change event races with address appearing.
2018-03-29 12:26:42 +01:00
akwizgran
8e9fc3b338
Enable LAN plugin to use wifi AP interface.
2018-03-29 12:26:42 +01:00
akwizgran
c3a70fe58d
Serialise concurrent calls to updateConnectionStatus().
2018-03-29 12:26:42 +01:00
akwizgran
ddfaddccdc
Serialise concurrent calls to bind().
2018-03-29 12:26:41 +01:00
akwizgran
4a892acdd5
Merge branch '845-wifi-without-internet' into 'master'
...
Looks like I added the last commit after the MR was merged.
2018-03-29 12:25:02 +01:00
akwizgran
bdb518ff09
Use wifi network's socket factory on API 21+.
2018-03-29 12:23:42 +01:00
akwizgran
8ebced9481
Show notification for low memory shutdown.
2018-03-29 11:45:03 +01:00
akwizgran
b81058d6da
Activate outgoing keys when incoming tag is recognised.
2018-03-28 12:39:03 +01:00
akwizgran
f7c2f86499
Add a method for checking whether we can send streams.
2018-03-28 12:39:03 +01:00
akwizgran
798b871cc9
Use key set ID to increment stream counter.
2018-03-28 12:39:02 +01:00
akwizgran
6787d29f11
Add a flag to indicate whether outgoing keys are active.
2018-03-28 12:39:02 +01:00
akwizgran
57e6f2ea9c
Unit tests for removing unbound keys.
2018-03-28 12:39:02 +01:00
akwizgran
0a802bbe0b
Add a method for removing unbound transport keys.
2018-03-28 12:39:02 +01:00
akwizgran
17fe358fd9
Add a method for binding transport keys to a contact.
2018-03-28 12:39:01 +01:00
akwizgran
5bd2092a03
Return key set IDs when adding unbound keys.
2018-03-28 12:39:01 +01:00
akwizgran
cb8f89db53
Add method for adding a contact without transport keys.
2018-03-28 12:39:01 +01:00
akwizgran
bb2f94d5eb
Add methods for adding unbound keys.
2018-03-28 12:39:01 +01:00
akwizgran
78f2d48bc4
Support multiple sets of transport keys per contact.
2018-03-28 12:38:59 +01:00
Torsten Grote
309c7a4668
Merge branch '965-empty-state-messages' into 'master'
...
Shorten and clean up various strings, remove empty forum warning bubble
See merge request akwizgran/briar!741
2018-03-26 16:59:12 +00:00
Torsten Grote
750f2b1b75
Merge branch 'hide-ui-during-shutdown' into 'master'
...
Hide UI during shutdown
See merge request akwizgran/briar!737
2018-03-26 16:53:16 +00:00
Torsten Grote
e7b2fe1906
Merge branch '545-message-dependencies' into 'master'
...
Add denormalised columns to messageDependencies table
See merge request akwizgran/briar!733
2018-03-26 15:58:01 +00:00
akwizgran
bfd22cfced
Merge branch '346-full-screen-qr-code' into 'master'
...
Add fullscreen button to QR code view
Closes #346
See merge request akwizgran/briar!734
2018-03-26 15:30:30 +00:00
akwizgran
ea0223ef1e
Merge branch '1159-android-8-notification-settings' into 'master'
...
Show different notification settings for Android O
Closes #1159
See merge request akwizgran/briar!727
2018-03-26 15:24:28 +00:00
Torsten Grote
38b739442c
Merge branch '845-wifi-without-internet' into 'master'
...
Use WifiManager to get wifi network information
Closes #845
See merge request akwizgran/briar!743
2018-03-26 14:54:03 +00:00
Torsten Grote
25f9ab7c33
Merge branch '1184-rejected-execution-exception' into 'master'
...
Discard tasks submitted to ScheduledExecutorService during shutdown
Closes #1184
See merge request akwizgran/briar!739
2018-03-26 14:27:42 +00:00
akwizgran
e0a1fa559d
Use WifiManager to get wifi network information.
...
This ensures we bind to the wifi interface even if it doesn't have internet access and there's another interface with internet access (e.g. mobile data).
2018-03-26 13:58:10 +01:00
akwizgran
196cf15ef2
Shut down cleanly when device shuts down.
2018-03-21 14:42:30 +00:00
akwizgran
6ff0f317a5
Shut down cleanly when memory is low.
2018-03-21 14:31:12 +00:00
Torsten Grote
5a3f47d72c
Merge branch '965-forum-empty-state' into 'master'
...
Remove mention of pen icon from forum empty state message
Closes #965
See merge request akwizgran/briar!740
2018-03-21 11:45:30 +00:00
akwizgran
7e784c6be1
Remove empty forum warning bubble.
2018-03-21 10:30:49 +00:00
akwizgran
3ee212f3ab
Consistent text for blogs and forums.
2018-03-21 10:28:10 +00:00
akwizgran
ee942790d3
Shorter empty state messages.
2018-03-21 10:27:09 +00:00
akwizgran
2d740675c7
Consistent explanation of account deletion options.
2018-03-21 10:24:17 +00:00
akwizgran
e4f3960ce0
Remove mention of pen icon from forum empty state message.
2018-03-21 10:18:18 +00:00
akwizgran
fef916991b
Discard tasks submitted during shutdown.
2018-03-20 17:41:30 +00:00
akwizgran
3fa38d3b28
Finish if back button is pressed in SignOutFragment.
2018-03-20 16:50:40 +00:00
akwizgran
48c41f77c7
Use database icon for SignOutFragment.
2018-03-20 16:50:40 +00:00
akwizgran
c3bf82c5b2
Close NavDrawerActivity immediately when signing out.
2018-03-20 16:50:40 +00:00
akwizgran
74fe36c46e
Use selectable item background to get touch effect.
2018-03-20 15:30:46 +00:00
akwizgran
0d5d1f4cb2
Adjust layout weights when resizing QR code view.
2018-03-20 15:22:58 +00:00
Torsten Grote
235183a3af
Merge branch '1177-blank-viewfinder' into 'master'
...
Show viewfinder again after connection fails
Closes #1177
See merge request akwizgran/briar!735
2018-03-20 13:13:14 +00:00