Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
briar
Compare revisions
439654e71d084537bbe631782df4a771dc469a50 to master
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
briar / briar
Select target project
No results found
master
Select Git revision
Loading items
Swap
Target
Julian Dehm / briar
Select target project
0 results
Searching
439654e71d084537bbe631782df4a771dc469a50
Select Git revision
Loading items
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source
3990
de7e3dd2
Store Bluetooth address and UUID at first startup.
Feb 8, 2018
565452f7
Don't set running = true until properties have been loaded.
Feb 8, 2018
9cce0d8e
Show an error fragment when an unsupported QR code is scanned
Feb 19, 2018
5fce8cbe
Don't poll for retransmission.
Feb 19, 2018
f88c68ef
Merge branch '545-denormalise-statuses' into 'master'
Feb 19, 2018
d880b14e
Merge branch '1134-old-qr-code-error' into 'master'
Feb 22, 2018
6dc72777
Merge branch '542-retransmission' into 'master'
Feb 22, 2018
0b781cf2
Use first byte of QR code payload for format version.
Feb 22, 2018
10f63ad6
Include requested messages when getting next send time.
Feb 22, 2018
a61cd013
Address review comments.
Feb 22, 2018
c6f2941e
Merge branch '542-include-requested-messages' into 'master'
Feb 22, 2018
363dfbc6
Merge branch '1164-store-bluetooth-properties' into 'master'
Feb 22, 2018
d395f086
Merge branch '1173-qr-code-version' into 'master'
Feb 22, 2018
528a52d0
Add landscape layout for QR code fragment.
Feb 22, 2018
66e3f6de
Crop camera preview before looking for QR code.
Feb 22, 2018
06897569
Add javadoc links.
Feb 22, 2018
bfdc79ac
Use ConstraintLayout for intro fragment.
Feb 22, 2018
3f1fb1ca
Merge branch '346-qr-code-optimisations' into 'master'
Feb 22, 2018
d5c89640
Inject StartupFailureActivity to prevent NPE.
Feb 23, 2018
05210257
Merge branch '1176-startup-failure-crash' into 'master'
Feb 23, 2018
46406d8d
Improve UX for startup failures
Feb 26, 2018
a8ed8657
Merge branch '1136-startup-failure-ux' into 'master'
Feb 26, 2018
c44a3d01
Fix notification light
Feb 28, 2018
9cdd5376
Refactor key agreement connection choosing.
Mar 2, 2018
976460e0
fix uncentered intro fragment
Mar 3, 2018
5cc0f08b
Merge branch '1154-fix-notification-light' into 'master'
Mar 5, 2018
6fbaae0e
Merge branch 'fix-intro-fragment' into 'master'
Mar 5, 2018
190aeef3
Passing in reference to FragmentManager when clicking links to prevent crash on Android 4
Mar 6, 2018
9f02bbbb
Do not show splash screen when signed in
Mar 6, 2018
80770b02
Show a status screen when opening the database or applying migrations
Mar 6, 2018
db7dbfce
Start NavDrawerActivity only after database was opened and services started
Mar 6, 2018
9a4f0b8e
Add more lifecycle states, merge lifecycle events.
Mar 6, 2018
a178dbae
Prevent transport indicators from looking like buttons
Mar 6, 2018
d52ca14e
Merge branch '1168-startup-status-screen' into 'master'
Mar 7, 2018
976c8a95
Merge branch '1174-link-click-crash' into 'master'
Mar 7, 2018
c073c5c8
Merge branch '283-key-exchange-connections' into 'master'
Mar 7, 2018
85cc2344
Merge branch 'transport-indicators-no-buttons' into 'master'
Mar 7, 2018
809b9f89
Update translations
Mar 7, 2018
03b49073
Disable settings until they have been loaded
Mar 7, 2018
f725c7ab
Merge branch '1169-settings-npe' into 'master'
Mar 8, 2018
5fe68e6f
Remove client ID from validator's DB methods.
Mar 9, 2018
a0c88da1
Report UNKNOWN state for cross-group dependencies.
Mar 14, 2018
4d502576
Merge branch '545-remove-clientid-from-validator-db-methods' into 'master'
Mar 14, 2018
f609ad1a
Show different notification settings for Android O
Mar 14, 2018
ff8b38f7
Use a different notification preference summary for Android 8
Mar 14, 2018
2367e6c4
Add denormalised columns to messageDependencies table.
Mar 14, 2018
9e2e0585
Index dependencies by dependency ID.
Mar 14, 2018
2c4d5680
Add fullscreen button to QR code view.
Mar 20, 2018
fcabf697
Remove performance logging.
Mar 20, 2018
33619228
Don't create a stack of QR code fragments.
Mar 20, 2018
701e51df
When resetting, restart camera if we've stopped it.
Mar 20, 2018
235183a3
Merge branch '1177-blank-viewfinder' into 'master'
Mar 20, 2018
0d5d1f4c
Adjust layout weights when resizing QR code view.
Mar 20, 2018
74fe36c4
Use selectable item background to get touch effect.
Mar 20, 2018
c3bf82c5
Close NavDrawerActivity immediately when signing out.
Mar 20, 2018
48c41f77
Use database icon for SignOutFragment.
Mar 20, 2018
3fa38d3b
Finish if back button is pressed in SignOutFragment.
Mar 20, 2018
fef91699
Discard tasks submitted during shutdown.
Mar 20, 2018
e4f3960c
Remove mention of pen icon from forum empty state message.
Mar 21, 2018
2d740675
Consistent explanation of account deletion options.
Mar 21, 2018
ee942790
Shorter empty state messages.
Mar 21, 2018
3ee212f3
Consistent text for blogs and forums.
Mar 21, 2018
7e784c6b
Remove empty forum warning bubble.
Mar 21, 2018
5a3f47d7
Merge branch '965-forum-empty-state' into 'master'
Mar 21, 2018
6ff0f317
Shut down cleanly when memory is low.
Mar 21, 2018
196cf15e
Shut down cleanly when device shuts down.
Mar 21, 2018
e0a1fa55
Use WifiManager to get wifi network information.
Mar 26, 2018
25f9ab7c
Merge branch '1184-rejected-execution-exception' into 'master'
Mar 26, 2018
38b73944
Merge branch '845-wifi-without-internet' into 'master'
Mar 26, 2018
ea0223ef
Merge branch '1159-android-8-notification-settings' into 'master'
Mar 26, 2018
bfd22cfc
Merge branch '346-full-screen-qr-code' into 'master'
Mar 26, 2018
e7b2fe19
Merge branch '545-message-dependencies' into 'master'
Mar 26, 2018
750f2b1b
Merge branch 'hide-ui-during-shutdown' into 'master'
Mar 26, 2018
309c7a46
Merge branch '965-empty-state-messages' into 'master'
Mar 26, 2018
78f2d48b
Support multiple sets of transport keys per contact.
Mar 28, 2018
bb2f94d5
Add methods for adding unbound keys.
Mar 28, 2018
cb8f89db
Add method for adding a contact without transport keys.
Mar 28, 2018
5bd2092a
Return key set IDs when adding unbound keys.
Mar 28, 2018
17fe358f
Add a method for binding transport keys to a contact.
Mar 28, 2018
0a802bbe
Add a method for removing unbound transport keys.
Mar 28, 2018
57e6f2ea
Unit tests for removing unbound keys.
Mar 28, 2018
6787d29f
Add a flag to indicate whether outgoing keys are active.
Mar 28, 2018
798b871c
Use key set ID to increment stream counter.
Mar 28, 2018
f7c2f864
Add a method for checking whether we can send streams.
Mar 28, 2018
b81058d6
Activate outgoing keys when incoming tag is recognised.
Mar 28, 2018
8ebced94
Show notification for low memory shutdown.
Mar 29, 2018
bdb518ff
Use wifi network's socket factory on API 21+.
Mar 29, 2018
4a892acd
Merge branch '845-wifi-without-internet' into 'master'
Mar 29, 2018
ddfaddcc
Serialise concurrent calls to bind().
Mar 29, 2018
c3a70fe5
Serialise concurrent calls to updateConnectionStatus().
Mar 29, 2018
8e9fc3b3
Enable LAN plugin to use wifi AP interface.
Mar 29, 2018
b2062693
AP state change event races with address appearing.
Mar 29, 2018
e385d581
Merge branch '1190-shutdown-from-background' into 'master'
Mar 29, 2018
46dae594
Delay handling of AP enabled event.
Mar 29, 2018
60dffd09
Update translations, add Romanian
Mar 29, 2018
ff44edf7
Merge branch '1171-wifi-access-point' into 'master'
Mar 29, 2018
5b790130
Don't reset circuit built flag unless network is disabled.
Mar 30, 2018
ede390b8
Merge branch '1180-tor-plugin-status' into 'master'
Mar 30, 2018
95b9b3a3
Merge branch 'multiple-transport-keys' into 'master'
Apr 17, 2018
0823934e
Don't download Tor binaries if they already exist.
Apr 17, 2018
3,890 additional commits have been omitted to prevent performance issues.
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Loading