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
4,443 Commits 133 Branches 200 Tags
fc10af73ca4be6d1b8a2c06282c71ad04309ef19
Commit Graph

4443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torsten Grote
fc10af73ca Allow actual QR code scanning and use dedicated contact alias fragment 2018-10-22 12:02:37 -03:00
Torsten Grote
6a25f20390 Add (non-functional) button for scanning QR code 2018-10-22 12:02:37 -03:00
Torsten Grote
12f7113b8d Only start one navdrawer activity with contact list 2018-10-22 12:02:37 -03:00
Torsten Grote
56960d51ca Add buttons to switch between showing link and code 2018-10-22 12:02:37 -03:00
Torsten Grote
42e10b1840 Move link input into fragment 2018-10-22 12:02:37 -03:00
Torsten Grote
e0f5c0b1f3 Check if lifecycle is running before adding fake contact 2018-10-22 12:02:37 -03:00
Torsten Grote
22cac6d44a Show QR code by default instead of link 2018-10-22 12:02:37 -03:00
akwizgran
6e109a8804 Accept links without briar:// prefix. 2018-10-22 12:02:37 -03:00
akwizgran
b9bd752f24 Try to make links clickable. 2018-10-22 12:02:37 -03:00
Torsten Grote
5d8f006370 Actually add fake contact ~1 minute after entering link 2018-10-22 12:02:37 -03:00
Torsten Grote
b6b7cfb27a Add pending contact requests screen 2018-10-22 12:02:37 -03:00
akwizgran
89d33a3a84 Use base32 for contact links. 2018-10-22 12:02:37 -03:00
akwizgran
bbdb9e150f Accept text shared by other apps. 2018-10-22 12:02:37 -03:00
akwizgran
f202ddd9a3 Add third speed dial action, share button. 2018-10-22 12:02:37 -03:00
Torsten Grote
ac87f23187 Add Activities for receiving and entering contact link 2018-10-22 12:02:34 -03:00
akwizgran
389b2b5b8e Merge branch '1423-check-lifecycle-state' into 'master' 
Check lifecycle state before changing fragment

Closes #1423

See merge request briar/briar!958
 2018-10-22 14:27:30 +00:00
Torsten Grote
78abfa3698 Check lifecycle state before changing fragment 2018-10-19 16:40:00 -03:00
akwizgran
e47d41596a Merge branch '1254-inject-object-mapper' into 'master' 
briar-headless: Inject a singleton ObjectMapper for JSON parsing

See merge request briar/briar!957
 2018-10-18 15:40:20 +00:00
Torsten Grote
8cf54bcedb briar-headless: Inject a singleton ObjectMapper for JSON parsing 2018-10-18 09:55:34 -03:00
akwizgran
89d5145665 Bump version numbers for 1.1.3 release. 2018-10-17 17:51:11 +01:00
Torsten Grote
0706498b03 Merge branch 'upgrade-android-gradle-plugin' into 'master' 
Upgrade Android Gradle plugin to 3.2.1.

See merge request briar/briar!956
 2018-10-17 16:36:24 +00:00
akwizgran
b296500e7a Update translations. 2018-10-17 12:41:24 +01:00
akwizgran
60a8b03344 Upgrade Android Gradle plugin to 3.2.1. 2018-10-17 12:34:13 +01:00
Torsten Grote
ae16a93522 Merge branch 'compact-at-startup' into 'master' 
Compact the database at startup

See merge request briar/briar!955
 2018-10-16 16:02:40 +00:00
Torsten Grote
c9a2ff71ae Merge branch 'tor-v3-hidden-service-addresses' into 'master' 
Add support for v3 hidden service addresses

See merge request briar/briar!952
 2018-10-16 15:55:34 +00:00
akwizgran
16f4c60a56 Add test for compaction time. 2018-10-16 11:39:06 +01:00
akwizgran
76121eb871 Always compact the DB if migrations have been applied. 2018-10-16 11:24:47 +01:00
akwizgran
47c91a96ae Compact the database at startup. 2018-10-16 11:13:37 +01:00
akwizgran
14befb957b Add support for v3 hidden service addresses. 2018-10-16 10:15:18 +01:00
Torsten Grote
b464fe1653 Merge branch 'message-terminology' into 'master' 
Use "text" to refer to message text

See merge request briar/briar!948
 2018-10-15 13:22:31 +00:00
akwizgran
09c6f09805 Merge branch '1420-tor-status-update' into 'master' 
Disable TorPlugin before applying changed settings

Closes #1420

See merge request briar/briar!953
 2018-10-15 12:54:41 +00:00
Torsten Grote
a93093182d Disable TorPlugin before applying changed settings 
The is necessary for two reasons:

1. Since Tor 0.3.4.8, it doesn't reconnect when changing the value of
   UseBridges via the control connection without also resetting
   DisableNetwork
2. The TorPlugin needs to set itself to a disconnected state for the UI
   to properly reflect this new state

Fixes #1420
 2018-10-15 09:43:12 -03:00
Torsten Grote
e776ee02b0 Merge branch 'tor-0.3.4.8' into 'master' 
Upgrade Tor to 0.3.4.8

See merge request briar/briar!951
 2018-10-11 22:44:45 +00:00
akwizgran
c0553ec11f Upgrade Linux Tor binaries to 0.3.4.8. 2018-10-11 15:05:39 +01:00
akwizgran
75a871a2f8 Upgrade Android Tor binaries to 0.3.4.8. 2018-10-11 14:38:18 +01:00
akwizgran
d6d3d5acef Merge branch '1240-no-empty-messages' into 'master' 
Don't allow empty message bodies

See merge request briar/briar!949
 2018-10-10 14:52:34 +00:00
Torsten Grote
a361a2613c Merge branch 'test-configurations' into 'master' 
Update test configurations for Android Studio 3.2

See merge request briar/briar!950
 2018-10-10 12:38:19 +00:00
akwizgran
b68dbd6a75 Merge branch 'upgrade-dependencies' into 'master' 
Upgrade some of the things

See merge request briar/briar!935
 2018-10-10 11:42:45 +00:00
akwizgran
f1e89a3ff4 Don't allow empty message bodies. 2018-10-10 10:57:41 +01:00
akwizgran
056c23167d Update test configurations for Android Studio 3.2. 2018-10-10 10:43:07 +01:00
akwizgran
79d5612645 Use "text" to refer to message text. 2018-10-10 10:40:30 +01:00
akwizgran
a030f92275 Merge branch 'headless' into 'master' 
Add Briar headless client that exposes a REST API

See merge request briar/briar!931
 2018-10-09 15:43:31 +00:00
Torsten Grote
b3615b4a77 briar-headless: Last round of review comments 2018-10-09 12:19:21 -03:00
akwizgran
8a15fb242a Merge branch 'briar-integration-test-transaction' into 'master' 
Remove custom DB transaction code from BriarIntegrationTest

See merge request briar/briar!946
 2018-10-09 14:16:23 +00:00
Torsten Grote
e3686186ee Fix closing server with ^C 2018-10-08 18:40:21 -03:00
akwizgran
18ae388137 Merge branch '1395-low-memory-crash' into 'master' 
Don't use non-AppCompat theme for AppCompat activities

Closes #1395

See merge request briar/briar!947
 2018-10-08 12:03:20 +00:00
Torsten Grote
775031e893 Don't use non-AppCompat theme for AppCompat activities 
Fixes #1395
 2018-10-05 16:50:11 -03:00
Torsten Grote
9f91b91a4f Remove custom DB transaction code from BriarIntegrationTest 2018-10-05 15:41:29 -03:00
Torsten Grote
280f3ba1fc briar-headless: POST text as JSON in body instead of form parameter 2018-10-05 15:23:31 -03:00
Torsten Grote
66619fd3a4 briar-headless: Next round of review comments 2018-10-05 15:23:31 -03:00