Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-04-18 22:18:14 +02:00
Code Issues Projects Releases Wiki Activity
5,732 Commits 133 Branches 203 Tags
bed3abfd40dea166c8c920bc1662167f85945413
Commit Graph

5732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran 27a169c6e2 Minimise use of message constructor. 2018-08-24 14:17:25 +01:00
akwizgran d4a4351786 Merge branch '758-db-exception-for-deleted-messages' into 'master' 
Throw an exception if a deleted message is requested from the DB

Closes #758

See merge request briar/briar!904
 2018-08-24 09:21:05 +00:00
akwizgran fbd38dbb94 Throw an exception if a raw message has been deleted. 2018-08-23 14:51:56 +01:00
akwizgran cd4897e6c9 Check whether getNetworkInterfaces() returns null. 2018-08-23 14:16:18 +01:00
akwizgran d84e176bb4 Merge branch 'fix_performance_test_db' into 'master' 
Fix the database performance tests

See merge request briar/briar!893
 2018-08-22 15:46:11 +00:00
Torsten Grote da8b49bec2 Merge branch 'log-relay-names' into 'master' 
Log Tor relay names to detect failing bridges

See merge request briar/briar!901
 2018-08-22 14:27:58 +00:00
akwizgran 6c8cc79d87 Log Tor relay names to detect failing bridges. 2018-08-22 14:21:41 +01:00
akwizgran a5271eee29 Merge branch 'switch-preference-android-4' into 'master' 
Use Material style for SwitchPreference on Android 4

See merge request briar/briar!897
 2018-08-20 19:40:56 +00:00
akwizgran 4dfc96996d Merge branch '1224-show-explanation-when-contact-exchange-fails' into 'master' 
Show an error fragment when contact exchange fails

See merge request briar/briar!890
 2018-08-20 19:40:36 +00:00
akwizgran 3139f308a2 Merge branch '1349-empty-state-ui' into 'master' 
Implement new empty state icons

Closes #1349

See merge request briar/briar!898
 2018-08-20 19:39:56 +00:00
Torsten Grote cc6daffa61 Merge branch 'update-bridges' into 'master' 
Replace two failing bridges

See merge request briar/briar!900
 2018-08-20 18:36:07 +00:00
Torsten Grote f08f441f5f Use Material style for SwitchPreference on Android 4 2018-08-20 15:22:55 -03:00
Torsten Grote 83886c78f1 Empty states: Address review comments 2018-08-20 15:14:53 -03:00
Torsten Grote 5ed0e9efec Implement new empty state icons 2018-08-20 15:14:53 -03:00
akwizgran 169c59349e Merge branch '1269-bridge-setting' into 'master' 
Refactor Tor settings and add a setting for forcing the use bridges

Closes #1269

See merge request briar/briar!895
 2018-08-20 17:56:56 +00:00
akwizgran 764f60b3fe Replace two failing bridges. 2018-08-20 17:57:36 +01:00
Torsten Grote e51c437a06 Merge branch 'ci-dev-urandom' into 'master' 
Use /dev/urandom for CI

See merge request briar/briar!899
 2018-08-20 16:24:49 +00:00
akwizgran 9fbf740ba7 Use /dev/urandom for tests. 2018-08-20 17:08:57 +01:00
akwizgran 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
akwizgran 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
Torsten Grote be72e624a3 ContactExchangeErrorFragment: Address review comments 2018-08-16 13:00:02 -03:00
Torsten Grote d9e9741112 Replace generic ErrorFragment with specific one 
when key agreement protocol doesn't match
 2018-08-16 12:34:20 -03:00
Torsten Grote 656ca8d67a Contact failure: Add better icon and remove technical error message 2018-08-16 12:34:20 -03:00
Torsten Grote d3e44358a4 Move feedback trigger and making link clickable to UiUtils 2018-08-16 12:34:20 -03:00
Torsten Grote 920a1d0431 Show an error fragment when contact exchange fails 2018-08-16 12:34:20 -03:00
Torsten Grote 4b9a9771f8 Tor settings: Address review comments 2018-08-16 12:27:26 -03:00
Torsten Grote d64252aaf3 Screen Lock Timeout: Address review comments 2018-08-16 12:16:45 -03:00
Torsten Grote 825ed451a3 Screen lock: Add a fallback in case alarm manager didn't run during sleep 2018-08-16 12:14:59 -03:00
Torsten Grote bffd78d404 Use a dedicated summary for 'never lock Briar' for proper English 2018-08-16 12:14:59 -03:00
Torsten Grote 04ffff0953 Screen Lock: Lock after customizable inactivity timeout 2018-08-16 12:14:59 -03:00
Torsten Grote 21f95ed9af Add a stroke for private message bubbles on Android 4 2018-08-16 12:07:54 -03:00
Torsten Grote c8b516196c Add new private message bubbles, get rid of 9-patch drawables 
This reverts commit f8a8c0d8b8.
 2018-08-16 10:22:15 -03:00
goapunk 941a0cccc3 Fix a regression in the performance tests causing the db key to be regenerated everytime. 2018-08-16 12:09:33 +02:00
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