db7686ea52
Merge branch '1247-pin-lock-activity-timeout' into 'master'
...
Screen Lock: Lock after customizable inactivity timeout
See merge request briar/briar!887
2018-08-20 13:52:23 +00:00
7fe21e079f
Merge branch '1358-message-bubbles' into 'master'
...
New Design for Message Bubbles
Closes #1358
See merge request briar/briar!896
2018-08-20 12:11:22 +00:00
be72e624a3
ContactExchangeErrorFragment: Address review comments
2018-08-16 13:00:02 -03:00
d9e9741112
Replace generic ErrorFragment with specific one
...
when key agreement protocol doesn't match
2018-08-16 12:34:20 -03:00
656ca8d67a
Contact failure: Add better icon and remove technical error message
2018-08-16 12:34:20 -03:00
d3e44358a4
Move feedback trigger and making link clickable to UiUtils
2018-08-16 12:34:20 -03:00
920a1d0431
Show an error fragment when contact exchange fails
2018-08-16 12:34:20 -03:00
4b9a9771f8
Tor settings: Address review comments
2018-08-16 12:27:26 -03:00
d64252aaf3
Screen Lock Timeout: Address review comments
2018-08-16 12:16:45 -03:00
825ed451a3
Screen lock: Add a fallback in case alarm manager didn't run during sleep
2018-08-16 12:14:59 -03:00
bffd78d404
Use a dedicated summary for 'never lock Briar' for proper English
2018-08-16 12:14:59 -03:00
04ffff0953
Screen Lock: Lock after customizable inactivity timeout
2018-08-16 12:14:59 -03:00
21f95ed9af
Add a stroke for private message bubbles on Android 4
2018-08-16 12:07:54 -03:00
c8b516196c
Add new private message bubbles, get rid of 9-patch drawables
...
This reverts commit f8a8c0d8b8
2018-08-16 10:22:15 -03:00
941a0cccc3
Fix a regression in the performance tests causing the db key to be regenerated everytime.
2018-08-16 12:09:33 +02:00
9b17836595
Refactor Tor settings and add a setting for forcing to use bridges
2018-08-15 17:32:43 -03:00
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
f399ce9290
Use gradle wrapper for updating dependency pinning instead of local gradle
2018-08-15 12:01:13 -03:00
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
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
987baba3bc
Update settings.xml
2018-08-14 10:00:36 +00:00
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
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
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
30a070dd13
Replace CheckBoxPreference witht he more standard SwitchPreference
2018-08-13 13:57:28 -03:00
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
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
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
16b09b9380
Make back-facing camera optional in manifest.
2018-08-10 16:31:35 +01:00
a1599df712
Remove unused constants.
2018-08-10 15:04:08 +01:00
afa3c3a70e
Screen Lock: Show verbose unlock message for older APIs
2018-08-10 07:44:10 -03:00
0f37a43415
Screen Lock: More changes due to code review
2018-08-10 07:44:10 -03:00
ef1d5d3233
Show lock icon when Briar is locked
2018-08-10 07:44:10 -03:00
feab825865
Don't show UnlockActivity anymore, might get removed completetly later
2018-08-10 07:44:10 -03:00
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
02ff37b187
Screen Lock: Second round of addressing review comments
2018-08-10 07:44:10 -03:00
6863727646
Upgrade robolectric to get Keyguard support for tests
2018-08-10 07:44:10 -03:00
087d6e9931
Screen Lock: Address first round of review comments
2018-08-10 07:44:10 -03:00
d79f1b667a
Move app locking logic into dedicatd LockManager
2018-08-10 07:44:10 -03:00
633f5a8bd7
Adapt foreground notification when locked and show LOCK button
2018-08-10 07:44:10 -03:00
90cb9a2fae
Disable screen lock setting instead of hiding it when not available
2018-08-10 07:44:10 -03:00
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
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
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
0e6c374d0e
Show names of countries where Tor is blocked.
2018-08-09 13:55:06 +01:00
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
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
7ffcace228
Rename Main Flavor due to internal conflicts
2018-08-08 16:52:28 -03:00
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
f8a8c0d8b8
Revert to old message bubbles pending design changes.
2018-08-08 10:35:05 +01:00
akwizgran
Torsten Grote
goapunk