Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-08-10 19:50:20 +02:00
Code Issues Projects Releases Wiki Activity
7,307 Commits 133 Branches 207 Tags
0b9481462036169a5960744f9ca323c6b3ecb658
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torsten Grote 0b94814620 Merge branch 'remove-migration-code' into 'master' 
Remove various bits of code whose migration periods have passed

See merge request briar/briar!1750
 2023-01-30 13:59:02 +00:00
Torsten Grote 795461d9a8 Clear mailbox problem notification after unlinking 2023-01-27 11:49:01 -03:00
Torsten Grote 7b8d01cfe0 Merge branch '1822-rss-feeds-backend' into 'master' 
Resolve "Import RSS feeds shared by other apps"

See merge request briar/briar!1763
 2023-01-25 11:39:34 +00:00
Torsten Grote 0cea137d75 Merge branch 'update-tor-bridges' into 'master' 
Update Tor bridges

See merge request briar/briar!1761
 2023-01-23 15:06:28 +00:00
Torsten Grote 9353b78da8 Clarify sharing state docs 2023-01-20 11:13:35 -03:00
Torsten Grote 429bbe1275 Introduce more sharing states 2023-01-20 11:13:35 -03:00
Torsten Grote c5fb1416bd Update JavaDoc for SharingState change 2023-01-20 11:13:34 -03:00
Torsten Grote e52cbd896e Introduce SharingStatus to report more fine-grained status 2023-01-20 11:13:34 -03:00
Torsten Grote 8b9140f477 Merge branch 'tor-0.4.7.12' into 'master' 
Upgrade Tor to 0.4.7.12

See merge request briar/briar!1755
 2023-01-13 16:25:42 +00:00
Torsten Grote bae97e3312 Merge branch 'unpack-tor-binaries-earlier' into 'master' 
Unpack Tor binaries earlier to avoid issues with task order

See merge request briar/briar!1742
 2022-11-11 18:21:31 +00:00
Torsten Grote 8262fa183b Revert "Replace illustration for mailbox success" 
This reverts commit 65509137
 2022-11-07 10:05:09 -03:00
Torsten Grote 0c40f39a90 Revert "Replace illustration for error fragment" 
This reverts commit dab8d731
 2022-11-07 09:53:19 -03:00
Torsten Grote 20b9aa86f7 revert icon changes 2022-11-07 09:53:19 -03:00
Torsten Grote a00c920382 Merge branch 'update-play-store-translations' into 'master' 
Update Play Store translations and config

See merge request briar/briar!1739
 2022-11-04 17:36:08 +00:00
Torsten Grote 5e1564de6c don't insist on 2 uploaded messages in case Bob deletes one of them quickly 2022-11-04 13:53:58 -03:00
Torsten Grote 155daae8d0 Execute Transifex for fastlane metadata from correct directory 2022-11-04 13:19:23 -03:00
Torsten Grote 6680abf925 Make MailboxIntegrationTest a bit more thorough 
by checking, after adding the contact to the mailbox but before creating the message, that the first file containing the mailbox update gets uploaded. Then after creating the message, the second file should be uploaded.
 2022-11-04 12:01:00 -03:00
Torsten Grote b7e1a987fc Don't depend on briar for mailbox integration tests 
Use transport properties instead of sending private messages
 2022-11-03 10:57:06 -03:00
Torsten Grote a705caa5fa Add better logging for integration tests by injecting a ThreadFactory that can set thread names 2022-11-02 13:25:30 -03:00
Torsten Grote 9c95534f39 Merge branch 'merge-redundant-strings' into 'master' 
Merge redundant strings

See merge request briar/briar!1737
 2022-11-01 13:17:04 +00:00
Torsten Grote 57015c36b2 Re-format witness.gradle to make it easier to see what changed 2022-11-01 09:57:48 -03:00
Torsten Grote 9ce82af856 Merge branch '348-add-hint-to-scan-both-qr-codes' into 'master' 
Add hints that both users need to scan each other's QR codes/add each other's links

See merge request briar/briar!1734
 2022-11-01 12:49:39 +00:00
Torsten Grote 4b792ff040 Remove jcenter repo from gradle files 2022-11-01 09:48:39 -03:00
Torsten Grote 904355b0a6 Replace khttp test library with a fork that is available on maven central 2022-11-01 09:48:38 -03:00
Torsten Grote 02f2fdd4a1 Vendorize TrustedIntents library and upgrade screengrab 2022-11-01 09:48:38 -03:00
Torsten Grote 05f84000b3 Merge branch 'testdatacreator-featureflags' into 'master' 
Prevent crash in TestDataCreator if blogs or forums are not enabled in core

Closes briar-desktop#420

See merge request briar/briar!1735
 2022-11-01 12:18:35 +00:00
Torsten Grote 324ca1b50b Address review feedback 2022-10-31 18:16:27 -03:00
Torsten Grote 52809d8f2d Add permission rationale for camera and Bluetooth combined 2022-10-27 10:47:06 -03:00
Torsten Grote 0a906998fe Address review feedback 2022-10-27 10:47:06 -03:00
Torsten Grote 4a65bc1726 Update some libraries 2022-10-27 10:43:30 -03:00
Torsten Grote f395ab1cb5 Disable our splash screen on Android 11+ 
in order to avoid two splash screens from being shown.
 2022-10-27 10:42:41 -03:00
Torsten Grote e6c051fee4 Require location for hotspot on Android 12+ 
This seems to be necessary. Without the location turned on, the hotspot does not start showing a p2p error.
 2022-10-27 10:42:41 -03:00
Torsten Grote e76701f988 Add current AppStandbyBucket to BriarReportCollector 2022-10-27 10:42:41 -03:00
Torsten Grote e6616a8c36 Exclude all files from D2D transfers 2022-10-27 10:42:40 -03:00
Torsten Grote 824a9e1124 Handle new BLUETOOTH_SCAN and BLUETOOTH_CONNECT permission 
We need to have those permissions before doing things like accessing the Bluetooth address. So we force-disable the Bluetooth plugin if the permission is not granted. The UI then forces the permission before allowing to enable the plugin.
 2022-10-27 10:42:40 -03:00
Torsten Grote 113793045f Set pending intents to be immutable 2022-10-27 10:42:40 -03:00
Torsten Grote c04937b1fa Do export only activities that need to react to external intents 
For some reason SettingsActivity does not need to be exported for it to be launched from system app settings.

androidx.test.ext:junit needed to be upgraded because it somehow brought in an activity without exported attribute
 2022-10-27 10:42:40 -03:00
Torsten Grote e8994d503e Bump targetSdk to 31 (Android 12) 2022-10-27 10:42:38 -03:00
Torsten Grote 645eba7fe7 Replace illustration for add contact nearby error 2022-10-25 15:49:04 -03:00
Torsten Grote c76ed41958 Replace illustration for share app offline intro 2022-10-25 15:49:04 -03:00
Torsten Grote 4a2c1113c1 Replace illustration for crash 2022-10-25 15:49:04 -03:00
Torsten Grote b6f78a8667 Replace illustration for connecting via Bluetooth 2022-10-25 15:49:03 -03:00
Torsten Grote 6dd250a1ed Merge branch 'only-retry-bridges-that-have-failed' into 'master' 
Speed up BridgeTest by only retrying bridges that have failed

See merge request briar/briar!1732
 2022-10-21 16:46:22 +00:00
Torsten Grote 2e2c720241 Replace illustration for transfer data onboarding 2022-10-21 12:25:19 -03:00
Torsten Grote 7e3cf8f162 Replace illustration for mailbox problem 2022-10-21 12:25:19 -03:00
Torsten Grote dab8d731fa Replace illustration for error fragment 2022-10-21 12:25:19 -03:00
Torsten Grote 65509137b6 Replace illustration for mailbox success 2022-10-21 12:25:19 -03:00
Torsten Grote 48ab5f4966 Replace illustration for mailbox download 2022-10-21 12:25:19 -03:00
Torsten Grote a37447d3e8 Replace illustration for mailbox onboarding 2022-10-21 12:25:18 -03:00
Torsten Grote 5d1d0fb12a Replace illustration for adding contacts nearby 2022-10-21 12:25:18 -03:00
Torsten Grote 790818623f Replace illustration for adding a nickname for pending contact 2022-10-21 12:25:18 -03:00
Torsten Grote d46a227cfc Add new illustration for adding contact remotely 2022-10-21 12:25:18 -03:00
Torsten Grote e986d4b214 Replace empty state images with new illustrations 2022-10-21 12:25:18 -03:00
Torsten Grote 7bcffdf0d1 Replace illustration for sending data from removable drive 2022-10-21 12:25:18 -03:00
Torsten Grote f4dd3c4f06 Replace illustration for receiving data from removable drive 2022-10-21 12:25:17 -03:00
Torsten Grote f42cf00c35 Fix BriarButton rendering in AS EditMode 
loses the style, but at least there's a preview now
 2022-10-21 12:25:17 -03:00
Torsten Grote 38c347552b Add UiUtils for hiding illustrations on small screens 2022-10-21 12:25:17 -03:00
Torsten Grote bab6ec70f5 Factor out mailbox constants into a MailboxConfig 
so that we can change them for integration tests via the new ModularMailboxModule that now also includes the UrlProvider
 2022-10-21 12:22:57 -03:00
Torsten Grote 28f770df89 Always run mailbox tests when changing them 2022-10-21 10:01:32 -03:00
Torsten Grote a720501fde First integration test for mailbox with two contacts 
one private message gets send via mailbox from one contact to the other
 2022-10-21 10:01:32 -03:00
Torsten Grote 648911b3ed clean up mailbox integration tests 2022-10-21 10:01:31 -03:00
Torsten Grote 3734e36782 Merge branch 'obfs4proxy-0.0.14-tor1' into 'master' 
Upgrade obfs4proxy to 0.0.14-tor1 and enable uTLS for meek-lite

See merge request briar/briar!1730
 2022-10-21 12:03:49 +00:00
Torsten Grote 6a5024e8a2 Merge branch 'update-meek-bridge' into 'master' 
Update meek bridge

See merge request briar/briar!1729
 2022-10-20 14:24:23 +00:00
Torsten Grote 55efb5f41d Merge branch 'snowflake-utls' into 'master' 
Use uTLS with Chrome profile for Snowflake

See merge request briar/briar!1728
 2022-10-19 17:00:33 +00:00
Torsten Grote 718d95f3d5 Merge branch 'use-mailbox-main' into 'master' 
Use mailbox main branch for integration tests

See merge request briar/briar!1721
 2022-10-03 14:38:32 +00:00
Torsten Grote d441618ea1 Merge branch 'fix-imports-null-safety' into 'master' 
Fix imports for null-safety annotations

See merge request briar/briar!1720
 2022-10-03 13:38:58 +00:00
Torsten Grote 2a2c054959 Merge branch '2343-mailbox-as-submodule' into 'master' 
End-to-end integration tests for communication via mailbox

Closes #2343

See merge request briar/briar!1699
 2022-10-03 13:11:18 +00:00
Torsten Grote abb4d43f14 Don't re-add mailbox intro fragment after activity got destroyed 2022-09-29 16:43:28 -03:00
Torsten Grote c049c9c370 re-show mailbox unpaired dialog after screen-rotation 2022-09-29 14:52:30 -03:00
Torsten Grote a0de0a40aa Merge branch 'socks-library' into 'master' 
Use SOCKS socket library

See merge request briar/briar!1717
 2022-09-29 16:26:17 +00:00
Torsten Grote 73d957434b Merge branch 'null-safety-library' into 'master' 
Use null safety library

See merge request briar/briar!1716
 2022-09-29 13:23:19 +00:00
Torsten Grote d4e5e3577b Merge branch '2366-tor-not-running-exception' into 'master' 
No longer crash when the Tor process crashes

Closes #2366

See merge request briar/briar!1715
 2022-09-28 17:04:04 +00:00
Torsten Grote ee417fc8d2 Merge branch 'snowflake' into 'master' 
Add Snowflake pluggable transport

See merge request briar/briar!1714
 2022-09-28 15:53:45 +00:00
Torsten Grote 04011e50bc Merge branch 'obfs4proxy-0.0.14' into 'master' 
Upgrade obfs4proxy to 0.0.14

See merge request briar/briar!1712
 2022-09-26 11:26:35 +00:00
Torsten Grote 8e5ec347f2 Make mailbox problem screen scrollable 
so all views will never overlap even on small screens in landscape orientation.
 2022-09-09 14:51:35 -03:00
Torsten Grote 480a4b5901 Merge branch 'tor-0.4.5.14' into 'master' 
Upgrade Tor to 0.4.5.14

Closes #2355

See merge request briar/briar!1708
 2022-09-05 12:16:12 +00:00
Torsten Grote 1c656d217c Merge branch 'upgrade-jsoup' into 'master' 
Upgrade jsoup to 1.15.3

See merge request briar/briar!1707
 2022-08-31 12:20:12 +00:00
Torsten Grote 3ac05e4b88 Use raster image for mailbox problem notifications 2022-08-29 11:56:48 -03:00
Torsten Grote 7aafbdd715 Merge branch '2354-show-confirmation-toast-after-unlinking' into 'master' 
Show confirmation toast after unlinking mailbox

Closes #2354

See merge request briar/briar!1703
 2022-08-17 17:01:33 +00:00
Torsten Grote 2c295fb096 Merge branch '2356-fix-expectations-for-flaky-unit-tests' into 'master' 
Fix expecations for unit tests

Closes #2356

See merge request briar/briar!1702
 2022-08-17 11:54:14 +00:00
Torsten Grote bcc7a4b93b Merge branch '2352-do-not-create-files-for-upload-while-connected' into 'master' 
Don't create files for upload while directly connected to contact

Closes #2352

See merge request briar/briar!1697
 2022-08-16 14:28:07 +00:00
Torsten Grote 4fe9fa3315 Merge branch '2228-mailbox-client-manager' into 'master' 
Add mailbox client manager

Closes #2228

See merge request briar/briar!1696
 2022-08-16 14:20:42 +00:00
Torsten Grote 96630e1b34 Merge branch '2174-check-own-mailbox-periodically' into 'master' 
Check our own mailbox periodically while we're online

Closes #2174

See merge request briar/briar!1698
 2022-08-16 13:54:14 +00:00
Torsten Grote 28ad66a03d Merge branch '2302-send-new-server-supported-versions-to-contacts' into 'master' 
When our mailbox's API versions change, send them to contacts

Closes #2302

See merge request briar/briar!1701
 2022-08-16 13:43:23 +00:00
Torsten Grote efb294de53 Merge branch 'update-tor-bridges' into 'master' 
Update Tor bridges

See merge request briar/briar!1700
 2022-08-15 14:59:40 +00:00
Torsten Grote 99755619c5 Merge branch '2228-more-mailbox-client-manager-preliminaries' into 'master' 
More mailbox client manager preliminaries

See merge request briar/briar!1694
 2022-08-15 14:27:23 +00:00
Torsten Grote a261b8e739 Merge branch '2228-mailbox-client-manager-preliminaries' into 'master' 
Preliminaries for mailbox client manager

See merge request briar/briar!1693
 2022-08-02 14:41:59 +00:00
Torsten Grote 6b6880c1ff Merge branch 'tolerate-missing-folders' into 'master' 
Tolerate 404 responses due to missing folders

See merge request briar/briar!1692
 2022-08-01 13:40:33 +00:00
Torsten Grote 37ff06d192 Merge branch '2290-client-for-own-mailbox' into 'master' 
Add mailbox client for our own mailbox

Closes #2290

See merge request briar/briar!1691
 2022-07-18 14:27:19 +00:00
Torsten Grote 200f83bcfe Merge branch '2293-own-mailbox-download-worker' into 'master' 
Mailbox download worker for our own mailbox

Closes #2293

See merge request briar/briar!1689
 2022-07-15 19:40:48 +00:00
Torsten Grote 87ee8cd653 Merge branch 'jtorctl-0.5' into 'master' 
Crash as soon as Tor closes the control connection

See merge request briar/briar!1686
 2022-07-11 12:04:25 +00:00
Torsten Grote 1531a24b2d Merge branch '1499-do-not-set-tor-config-during-shutdown' into 'master' 
Don't set "DisableNetwork 1" during shutdown

See merge request briar/briar!1684
 2022-07-01 13:10:02 +00:00
Torsten Grote d8e26eebbe Merge branch '1499-do-not-apply-redundant-settings' into 'master' 
Start from default Tor config every time, don't apply redundant settings

See merge request briar/briar!1681
 2022-06-29 13:50:01 +00:00
Torsten Grote ddb759dbb8 Merge branch 'mailbox-base-url-refactoring' into 'master' 
Refactor MailboxProperties to hold raw onion address

See merge request briar/briar!1680
 2022-06-23 17:27:17 +00:00
Torsten Grote 4ba4e41e69 Merge branch '2294-contact-list-worker' into 'master' 
Mailbox worker for updating our own mailbox's contact list

Closes #2294

See merge request briar/briar!1677
 2022-06-23 12:19:32 +00:00
Torsten Grote b01c306500 Merge branch '2289-client-for-contacts-mailbox' into 'master' 
Mailbox client for a contact's mailbox

Closes #2289

See merge request briar/briar!1674
 2022-06-22 17:09:37 +00:00
Torsten Grote 61e7635b9f Merge branch 'windows-tor-plugin' into 'master' 
Add Tor plugin for Windows

See merge request briar/briar!1666
 2022-06-22 17:08:23 +00:00
Torsten Grote 28f3ab1310 Dismiss unlink dialog when going offline 2022-06-22 13:25:12 -03:00
Torsten Grote 1af52b21d5 Ensure that mailbox setup can proceed after activity was destroyed 2022-06-22 11:44:07 -03:00
Torsten Grote a742b007ef Don't crash when offline while unlink dialog gets shown 2022-06-22 08:58:59 -03:00