Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity
3,649 Commits 133 Branches 200 Tags
25f9ab7c331a720624cf228acdac78058c4fc116
Commit Graph

3649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
akwizgran
701e51dfc8 When resetting, restart camera if we've stopped it. 2018-03-20 11:58:58 +00:00
akwizgran
3361922834 Don't create a stack of QR code fragments. 2018-03-20 11:58:57 +00:00
akwizgran
fcabf697d6 Remove performance logging. 2018-03-20 11:58:57 +00:00
Torsten Grote
4d502576c9 Merge branch '545-remove-clientid-from-validator-db-methods' into 'master' 
Remove client ID from validator's DB methods

See merge request akwizgran/briar!732
 2018-03-14 12:39:59 +00:00
akwizgran
5fe68e6f82 Remove client ID from validator's DB methods. 2018-03-09 16:11:58 +00:00
akwizgran
f725c7ab9a Merge branch '1169-settings-npe' into 'master' 
Disable settings until they have been loaded

Closes #1169

See merge request akwizgran/briar!726
 2018-03-08 15:40:13 +00:00
Torsten Grote
03b4907311 Disable settings until they have been loaded 
In practise, this is not noticeable in the UI.
Only when the database is congested, it should become visible and
prevent a crash when the sound setting is clicked.
 2018-03-07 15:20:09 -03:00
Torsten Grote
809b9f8919 Update translations 2018-03-07 09:49:46 -03:00
akwizgran
85cc23444c Merge branch 'transport-indicators-no-buttons' into 'master' 
Prevent transport indicators from looking like buttons

Closes #185

See merge request akwizgran/briar!714
 2018-03-07 10:41:13 +00:00
akwizgran
c073c5c8bd Merge branch '283-key-exchange-connections' into 'master' 
Refactor key agreement connection choosing

Closes #283

See merge request akwizgran/briar!711
 2018-03-07 10:37:45 +00:00
akwizgran
976c8a9578 Merge branch '1174-link-click-crash' into 'master' 
Get unwrapped context when clicking links to prevent crash on Android 4

Closes #1174

See merge request akwizgran/briar!709
 2018-03-07 10:36:33 +00:00
akwizgran
d52ca14ebe Merge branch '1168-startup-status-screen' into 'master' 
Show status message while opening and migrating DB

Closes #1168

See merge request akwizgran/briar!708
 2018-03-07 10:30:11 +00:00
Torsten Grote
a178dbae9e Prevent transport indicators from looking like buttons 2018-03-06 16:58:23 -03:00
akwizgran
9a4f0b8e89 Add more lifecycle states, merge lifecycle events. 2018-03-06 15:21:26 -03:00
Torsten Grote
db7dbfce68 Start NavDrawerActivity only after database was opened and services started 2018-03-06 15:14:37 -03:00
Torsten Grote
80770b0216 Show a status screen when opening the database or applying migrations 2018-03-06 15:14:36 -03:00
Torsten Grote
9f02bbbba1 Do not show splash screen when signed in 2018-03-06 15:14:35 -03:00
Torsten Grote
190aeef34e Passing in reference to FragmentManager when clicking links to prevent crash on Android 4 2018-03-06 15:01:37 -03:00
akwizgran
6fbaae0e5e Merge branch 'fix-intro-fragment' into 'master' 
Fix uncentered intro fragment

See merge request akwizgran/briar!712
 2018-03-05 10:51:56 +00:00
akwizgran
5cc0f08b8f Merge branch '1154-fix-notification-light' into 'master' 
Fix notification light

Closes #1154

See merge request akwizgran/briar!710
 2018-03-05 10:49:29 +00:00
goapunk
976460e0b7 fix uncentered intro fragment 
Signed-off-by: goapunk <noobie@goapunks.net>
 2018-03-03 16:21:34 +01:00
akwizgran
9cdd537600 Refactor key agreement connection choosing. 2018-03-02 13:11:56 +00:00
Torsten Grote
c44a3d01b9 Fix notification light 2018-02-28 12:53:22 -03:00
akwizgran
a8ed86575d Merge branch '1136-startup-failure-ux' into 'master' 
Improve UX for startup failures

Closes #1136

See merge request akwizgran/briar!706
 2018-02-26 17:18:44 +00:00
Torsten Grote
46406d8d1a Improve UX for startup failures 
Show a proper error message when database is too new or too old.
 2018-02-26 13:39:07 -03:00
Torsten Grote
05210257a0 Merge branch '1176-startup-failure-crash' into 'master' 
Inject StartupFailureActivity to prevent NPE

Closes #1176

See merge request akwizgran/briar!705
 2018-02-23 12:24:29 +00:00
akwizgran
d5c89640c1 Inject StartupFailureActivity to prevent NPE. 2018-02-23 09:22:31 +00:00
Torsten Grote
3f1fb1ca1c Merge branch '346-qr-code-optimisations' into 'master' 
Improve QR code scanning on phones with high res cameras and slow CPUs

Closes #1068

See merge request akwizgran/briar!699
 2018-02-22 18:09:52 +00:00
akwizgran
bfdc79ac60 Use ConstraintLayout for intro fragment. 2018-02-22 17:10:19 +00:00
akwizgran
06897569d4 Add javadoc links. 2018-02-22 17:10:18 +00:00
akwizgran
66e3f6deba Crop camera preview before looking for QR code. 2018-02-22 17:10:16 +00:00
akwizgran
528a52d0f7 Add landscape layout for QR code fragment. 2018-02-22 17:09:33 +00:00
Torsten Grote
d395f0866a Merge branch '1173-qr-code-version' into 'master' 
Use first byte of QR code payload for format version

Closes #1173

See merge request akwizgran/briar!702
 2018-02-22 16:40:30 +00:00
akwizgran
363dfbc6aa Merge branch '1164-store-bluetooth-properties' into 'master' 
Store Bluetooth address and UUID at first startup

Closes #1164

See merge request akwizgran/briar!694
 2018-02-22 15:11:01 +00:00
Torsten Grote
c6f2941e74 Merge branch '542-include-requested-messages' into 'master' 
Include requested messages when getting next send time

See merge request akwizgran/briar!704
 2018-02-22 13:09:44 +00:00
akwizgran
a61cd01336 Address review comments. 2018-02-22 12:52:49 +00:00
akwizgran
10f63ad60b Include requested messages when getting next send time. 2018-02-22 12:46:33 +00:00
akwizgran
0b781cf272 Use first byte of QR code payload for format version. 2018-02-22 11:59:06 +00:00
akwizgran
6dc7277771 Merge branch '542-retransmission' into 'master' 
Don't poll for retransmission

Closes #542

See merge request akwizgran/briar!695
 2018-02-22 11:07:21 +00:00
akwizgran
d880b14e0c Merge branch '1134-old-qr-code-error' into 'master' 
Show an error fragment when an unsupported QR code is scanned

Closes #1134

See merge request akwizgran/briar!675
 2018-02-22 10:55:44 +00:00
Torsten Grote
f88c68eff4 Merge branch '545-denormalise-statuses' into 'master' 
Add denormalised columns to statuses table

See merge request akwizgran/briar!691
 2018-02-19 16:53:55 +00:00
akwizgran
5fce8cbe0a Don't poll for retransmission. 2018-02-19 16:27:04 +00:00
akwizgran
439654e71d Test that visibility change affects expected contacts. 2018-02-19 16:25:02 +00:00
akwizgran
7fe502e3cc Add denormalised columns to statuses table. 2018-02-19 16:07:08 +00:00
akwizgran
aa07d0cadd Merge branch '509-tap-viewfinder-to-auto-focus' into 'master' 
Tap viewfinder to restart auto focus

Closes #509

See merge request akwizgran/briar!697
 2018-02-19 15:57:49 +00:00