Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity
3,418 Commits 133 Branches 200 Tags
2d26af1ae280ae3eb99ddc7942e350384a33e49a
Commit Graph

39 Commits

Author SHA1 Message Date
akwizgran
d6a7e6d52c Resolve merge conflicts. 
# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java
 2017-11-21 10:27:31 +00:00
goapunk
f84fa588f6 simply bramble-androids's build.gradle 
Signed-off-by: goapunk <noobie@goapunks.net>
 2017-11-17 16:43:07 +01:00
akwizgran
53c8cf09b6 Support Java 8 language features in Android modules. 2017-11-16 11:46:34 +00:00
akwizgran
9f29bf4949 Upgrade Gradle and Android Gradle plugin 2017-11-16 11:46:32 +00:00
akwizgran
98e2adf794 Fix Dagger setup, remove android-apt plugin. 2017-11-16 11:46:02 +00:00
goapunk
e402a894bb Change wake lock tag 
Signed-off-by: goapunk <noobie@goapunks.net>
 2017-10-24 13:45:27 +02:00
akwizgran
220f678403 Removed unused location permission. 2017-10-18 14:05:11 +01:00
akwizgran
6f7f8b40e3 Upgraded Gradle plugin and build tools. 2017-10-17 15:31:28 +01:00
akwizgran
1a83b2c99b Bumped version number for beta release. 2017-10-17 09:41:11 +01:00
akwizgran
13d35229d5 Merge branch '1091-reduce-polling-queries' into 'master' 
Reduce number of DB queries used when polling for connections

Closes #1091

See merge request !604
 2017-10-11 13:45:14 +00:00
akwizgran
e074672e86 Reduce DB queries for looking up transport properties. 2017-10-10 10:59:39 +01:00
akwizgran
9993bac3a1 Disable Bluetooth at shutdown if we enabled it. 2017-10-03 15:59:07 +01:00
Torsten Grote
1bf0fdfa81 Add an option to debug builds to create fake test data 2017-09-27 13:55:29 -03:00
Michael Rogers
ef2286ab53 Bumped version number for beta release. 2017-09-20 14:51:10 +01:00
Torsten Grote
ed01048f9f Merge branch 'remove-old-bluetooth-code' into 'master' 
Remove old Bluetooth code and location permission

See merge request !584
 2017-09-19 14:16:13 +00:00
Torsten Grote
6e0af7deda Merge branch '1060-upgrade-tor' into 'master' 
Upgrade Tor to 0.2.9.12

Closes #1060

See merge request !590
 2017-09-19 12:14:55 +00:00
akwizgran
9591db2097 Upgrade Tor to 0.2.9.12. 
Libevent 2.0.22-stable, OpenSSL 1.0.2l and GeoIP 2017-09-06.
 2017-09-19 12:49:22 +01:00
akwizgran
27422ab9f9 Catch NPE when getting socket input/output streams. 
Works around a bug in Android 7, fixed in 7.1.
 2017-09-18 15:47:12 +01:00
Michael Rogers
d24b1884a2 Removed old Bluetooth code and the location permission it requires. 2017-08-11 12:42:47 +01:00
Michael Rogers
078534889e Bumped version number for beta release. 2017-08-04 15:16:51 +01:00
akwizgran
775dadc9a0 Merge branch '904-notify-tor-controller' into 'master' 
Notify Tor controller if Tor has crashed

Closes #904

See merge request !543
 2017-07-03 09:29:04 +00:00
Torsten Grote
d24de68d64 Merge branch '574-upgrade-tor' into 'master' 
Upgrade Tor to 0.2.9

Closes #574

See merge request !542
 2017-06-30 20:36:22 +00:00
akwizgran
37454392da Update Tor binaries to 0.2.9.11. 2017-06-23 22:06:00 +01:00
akwizgran
96d2889a6c Notify Tor controller if Tor has crashed. 2017-06-23 14:57:00 +01:00
akwizgran
b377cd6b1c Upgrade Spongy Castle and some other dependencies. 2017-06-12 17:44:08 +01:00
akwizgran
3449677b24 Bumped version number and expiry date. 2017-05-19 12:07:29 +01:00
akwizgran
ba353b9f2b List of wifi configs can be null. 2017-04-06 10:11:59 +01:00
akwizgran
d9c63bbcfe Remove Fortuna generator, fix Android SecureRandom bug. 2017-03-29 16:31:59 +01:00
akwizgran
7161152b41 Merge branch '903_replace_Runtime_with_ProcessBuilder' into 'master' 
Use ProcessBuilder instead of Runtime to start tor

See merge request !487
 2017-03-27 09:37:00 +00:00
akwizgran
c167938b61 Use constants for Tor network setting values. 2017-03-27 10:26:10 +01:00
akwizgran
e682f31898 Added a setting to disable Tor. 
Also fixed a bug with settings namespaces.
 2017-03-24 14:56:30 +00:00
akwizgran
d9a62a0431 Merge branch 'print_tor_errors' into 'master' 
Make Tor boot more verbose

See merge request !486
 2017-03-24 10:01:29 +00:00
goapunk
ce3156c9fe Use ProcessBuilder instead of Runtime to start tor 
* ProcessBuilder copies the ENV from the current proc
  and preserves ANDROID_ROOT and ANDROID_DATA

Signed-off-by: goapunk <noobie@goapunks.net>
 2017-03-18 09:46:24 +01:00
goapunk
be3752bf2f Set Android env vars 
Signed-off-by: goapunk <noobie@goapunks.net>

(cherry picked from commit e26f663)
 2017-03-17 16:00:34 +00:00
noobie
ef74db65aa Make Tor boot more verbose 
Signed-off-by: noobie <noobie@goapunks.net>
 2017-03-13 12:19:14 +01:00
Torsten Grote
ffc9fdbb92 Plugins throw exceptions for startup errors 2016-12-14 16:35:23 -02:00
akwizgran
cdd234dfe3 Ensure key agreement tasks finish if they ignore interrupts. 2016-12-05 12:38:45 +00:00
akwizgran
906dd1bd06 Added .gitignore files for new modules. 2016-12-01 10:08:46 +00:00
akwizgran
ad6016d428 Updated java.library.path. 2016-11-30 18:10:49 +00:00