Torsten Grote
9b17836595
Refactor Tor settings and add a setting for forcing to use bridges
2018-08-15 17:32:43 -03:00
akwizgran
e5112ae9ee
Merge branch 'gradle-witness' into 'master'
...
Move gradle witness dependency verification into dedicated files
See merge request briar/briar!892
2018-08-15 15:21:56 +00:00
Torsten Grote
f399ce9290
Use gradle wrapper for updating dependency pinning instead of local gradle
2018-08-15 12:01:13 -03:00
Torsten Grote
30e036c672
Move gradle witness dependency verification into dedicated files
...
This also adds a script for makes upgrading dependency checksums so much easier
2018-08-14 18:01:34 -03:00
akwizgran
2896700e50
Merge branch 'preference-switches' into 'master'
...
Replace CheckBoxPreference with the more standard SwitchPreference
See merge request briar/briar!891
2018-08-14 10:21:12 +00:00
akwizgran
987baba3bc
Update settings.xml
2018-08-14 10:00:36 +00:00
akwizgran
03191ff08f
Merge branch 'master' into 'preference-switches'
...
# Conflicts:
# briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
2018-08-14 09:59:22 +00:00
akwizgran
42031631dd
Merge branch '1247-pin-lock' into 'master'
...
Screen Lock Feature
See merge request briar/briar!870
2018-08-14 09:28:04 +00:00
Torsten Grote
64e30844b8
Screen Lock: Remember when keyguard was shown (for Android 6)
...
Also automatically unlock if device screenlock was removed.
2018-08-13 14:36:35 -03:00
Torsten Grote
30a070dd13
Replace CheckBoxPreference witht he more standard SwitchPreference
2018-08-13 13:57:28 -03:00
Torsten Grote
4f18303a1f
Merge branch 'remove-unused-constants' into 'master'
...
Remove unused constants
See merge request briar/briar!889
2018-08-10 17:30:16 +00:00
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
Torsten Grote
4d63272c04
Prevent activity loops when pressing back button while unlocking
...
This solution even works when "don't keep activities" is active
2018-08-10 13:28:43 -03:00
akwizgran
16b09b9380
Make back-facing camera optional in manifest.
2018-08-10 16:31:35 +01:00
akwizgran
a1599df712
Remove unused constants.
2018-08-10 15:04:08 +01:00
Torsten Grote
afa3c3a70e
Screen Lock: Show verbose unlock message for older APIs
2018-08-10 07:44:10 -03:00
Torsten Grote
0f37a43415
Screen Lock: More changes due to code review
2018-08-10 07:44:10 -03:00
Torsten Grote
ef1d5d3233
Show lock icon when Briar is locked
2018-08-10 07:44:10 -03:00
Torsten Grote
feab825865
Don't show UnlockActivity anymore, might get removed completetly later
2018-08-10 07:44:10 -03:00
Torsten Grote
5d2c96f916
Remove LOCK button from foreground notification
...
When the user removes the screen lock, the app does not get really
locked. There is no way about getting notified about this. Before users
lock the app without it getting actually locked, we rather remove the
button that was collapsed and not easy to find anyway.
2018-08-10 07:44:10 -03:00
Torsten Grote
02ff37b187
Screen Lock: Second round of addressing review comments
2018-08-10 07:44:10 -03:00
Torsten Grote
6863727646
Upgrade robolectric to get Keyguard support for tests
2018-08-10 07:44:10 -03:00
Torsten Grote
087d6e9931
Screen Lock: Address first round of review comments
2018-08-10 07:44:10 -03:00
Torsten Grote
d79f1b667a
Move app locking logic into dedicatd LockManager
2018-08-10 07:44:10 -03:00
Torsten Grote
633f5a8bd7
Adapt foreground notification when locked and show LOCK button
2018-08-10 07:44:10 -03:00
Torsten Grote
90cb9a2fae
Disable screen lock setting instead of hiding it when not available
2018-08-10 07:44:10 -03:00
Torsten Grote
fc86319e13
MVP of PIN lock feature
...
This only shows the settings if a screen lock is available.
If the setting is activated, it shows a drawer item for locking.
Once locked, the screen lock secret needs to be entered to enter the
app again.
First part of #1247
2018-08-10 07:44:10 -03: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
