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
4,124 Commits 133 Branches 200 Tags
5c500fb7401b60471556462aa9546b2e84a76da5
Commit Graph

4124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torsten Grote
5c500fb740 Merge branch 'back-facing-camera-not-required' into 'master' 
Make back-facing camera optional in manifest

See merge request briar/briar!888
 2018-08-10 16:30:29 +00:00
akwizgran
16b09b9380 Make back-facing camera optional in manifest. 2018-08-10 16:31:35 +01:00
Torsten Grote
af1ed292ae Merge branch '832-android-tor-plugin' into 'master' 
Factor out Android-specific code from TorPlugin

Closes #832

See merge request briar/briar!876
 2018-08-09 19:36:00 +00:00
Torsten Grote
5393127400 Merge branch 'show-blocked-country-names' into 'master' 
Show names of countries where Tor is blocked

See merge request briar/briar!886
 2018-08-09 13:21:22 +00:00
akwizgran
0e6c374d0e Show names of countries where Tor is blocked. 2018-08-09 13:55:06 +01:00
akwizgran
52efbcac8a Merge branch '1360-rename-main-flavor' into 'master' 
Rename main flavor due to internal conflicts

Closes #1360

See merge request briar/briar!885
 2018-08-09 08:58:24 +00:00
Torsten Grote
acf6a45004 Merge branch 'replace-assert-statements' into 'master' 
Replace assert statements with AssertionErrors

See merge request briar/briar!877
 2018-08-08 19:56:38 +00:00
Torsten Grote
7ffcace228 Rename Main Flavor due to internal conflicts 2018-08-08 16:52:28 -03:00
akwizgran
e157fdfc7b Merge branch '1251-dark-theme-old-message-bubbles' into 'master' 
Dark Theme Changes

See merge request briar/briar!884
 2018-08-08 15:18:50 +00:00
akwizgran
f8a8c0d8b8 Revert to old message bubbles pending design changes. 2018-08-08 10:35:05 +01:00
Torsten Grote
f53aeef0d6 Merge branch 'logger-names' into 'master' 
Use full class names for loggers

See merge request briar/briar!881
 2018-08-07 14:27:57 +00:00
akwizgran
f812acb00b Use general-purpose resource provider. 2018-08-07 15:19:46 +01:00
akwizgran
004467e84e Factor out remaining Android code from Tor plugin. 2018-08-07 15:19:43 +01:00
akwizgran
34c0a83e36 Use full class names for loggers. 2018-08-07 15:17:19 +01:00
Torsten Grote
fd0dad8936 Restore old button size and ensure timestamps are not selectable 2018-08-06 14:26:02 -03:00
Torsten Grote
32420a0781 Give names to colors and clean them up 2018-08-06 13:16:53 -03:00
Torsten Grote
b6c85c8bf6 More Dark Theme Changes after designer feedback 2018-08-06 13:16:53 -03:00
Torsten Grote
4163731ec3 New private message bubbles 
This gets rid of all those pesky 9-Patch drawables
 2018-08-06 13:16:53 -03:00
akwizgran
8e732d880f Merge branch '47-sign-in-reminder' into 'master' 
Do not show sign-in reminder once PasswordActivity was opened

Closes #47

See merge request briar/briar!879
 2018-08-06 09:38:05 +00:00
Torsten Grote
0b2594a693 Move SignIn reminder code into AndroidNotificationManager and don't show reminder once PasswordActivity was opened 2018-08-03 15:08:57 -03:00
akwizgran
7e009ceaf2 Merge branch '596-espresso' into 'master' 
Setup UI Tests with Espresso for Automatic Localized Screenshots

Closes #596

See merge request briar/briar!863
 2018-08-03 16:38:57 +00:00
Torsten Grote
b238b28ef9 Remove PasswordActivity test since it doesn't work anyway 2018-08-03 13:09:42 -03:00
Torsten Grote
edb8e8f9d0 Move res values from build.gradle into strings.xml 
This fixes an issue where the build type values were overriding the
flavor values.
 2018-08-03 13:08:18 -03:00
Torsten Grote
cc6041e90c Rename Component and Screenshot Tests 2018-08-03 11:42:01 -03:00
Torsten Grote
3ff6462899 Refactor Espresso tests to use new AccountManager 2018-08-03 11:20:43 -03:00
Torsten Grote
6f7d0c6f77 Do proper Doze white-listing in UI tests 2018-08-03 11:20:43 -03:00
Torsten Grote
412381f37e Move buildType to flavor and add hashes for pinning of androidTest dependencies 2018-08-03 11:20:33 -03:00
Torsten Grote
05fbb87c06 Add a NavDrawerActivityTest 2018-08-03 11:16:52 -03:00
Torsten Grote
daf5db470f Use demo mode when taking screenshots to clear status bar 
https://android.googlesource.com/platform/frameworks/base/+/master/packages/SystemUI/docs/demo_mode.md
 2018-08-03 11:16:52 -03:00
Torsten Grote
be2d695150 Setup fastlane 
This is great for automatically uploading (localized) screenshots
and app metadata to Google Play.
You can even upload the signed APK releases as well.

For now, this is only useful for running the screenshot Espresso tests
and grabbing the screenshots from the device.
 2018-08-03 11:16:52 -03:00
Torsten Grote
d0c2c03057 First prototype of Espresso test infrastructure with automatic screenshoting 2018-08-03 11:16:52 -03:00
Torsten Grote
db11e0101a Merge branch '1355-disable-tor-setting' into 'master' 
Add a setting to override location-based disabling of Tor

Closes #1355

See merge request briar/briar!871
 2018-08-03 13:35:33 +00:00
akwizgran
25b8932cde Merge branch '47-sign-in-reminder' into 'master' 
Don't show sign-in reminder if user is signed-in already

Closes #47

See merge request briar/briar!872
 2018-08-03 10:59:25 +00:00
akwizgran
0d658513ba Disable bridges when network is manually enabled. 2018-08-03 11:53:50 +01:00
akwizgran
732bf6d4ec Show countries where Tor is blocked. 2018-08-03 11:53:50 +01:00
akwizgran
53762e7c93 Add setting to override location-based disabling of Tor. 2018-08-03 11:53:47 +01:00
akwizgran
5a145c9eb2 Replace assert statements with AssertionErrors. 2018-08-03 11:14:15 +01:00
akwizgran
d8ce1d75ca Add run configuration for bramble-android tests. 2018-08-03 10:17:36 +01:00
Torsten Grote
77b2fa8acb Merge branch '832-fix-bridge-test' into 'master' 
Fix Tor bridge integration test

See merge request briar/briar!875
 2018-08-02 15:00:57 +00:00
akwizgran
f9d5873385 Fix Tor bridge test. 2018-08-02 15:51:28 +01:00
Torsten Grote
1de6c863df Merge branch '832-network-manager' into 'master' 
Factor network management code out of plugins

See merge request briar/briar!874
 2018-08-02 14:36:17 +00:00
akwizgran
8c5c66fa9a Add null-safety and thread-safety annotations. 2018-08-02 15:06:17 +01:00
Torsten Grote
82f939ecd4 Don't show sign-in reminder if user is signed-in already 2018-08-02 09:50:42 -03:00
akwizgran
1a5c02f8a9 Remove extra logging. 2018-08-02 13:22:54 +01:00
akwizgran
16d56535ca Check connectivity after all AP state changes. 2018-08-02 13:22:53 +01:00
akwizgran
dcd6fda046 Check connectivity after entering or leaving doze mode. 2018-08-02 13:22:53 +01:00
akwizgran
2535445831 Factor network management code out of plugins. 2018-08-02 13:22:50 +01:00
Torsten Grote
c0d5a3a5ea Merge branch '1341-account-manager-refactoring' into 'master' 
Refactor authentication and account management code

Closes #1341

See merge request briar/briar!866
 2018-08-02 11:49:15 +00:00
akwizgran
c1789a8e52 Move identity creation into AccountManager. 2018-08-02 09:51:17 +01:00
akwizgran
2a0ecc3f80 Clean up some tests. 2018-08-01 16:49:14 +01:00