ameba23
4972c554dc
fix pathname in settings.xml
2021-03-05 12:30:15 +01:00
ameba23
44e33e3d1a
add DistributedBackupActivity for AndroidManifest
2021-03-05 11:34:30 +01:00
ameba23
5212bb7a01
add settings menu item
2021-03-05 10:28:53 +01:00
ameba23
83aad185cd
add missing string
2021-03-05 10:28:33 +01:00
ameba23
c318dcfb5f
rm CustodianDisplayFragment
2021-03-05 10:27:58 +01:00
ameba23
10610930c0
dont inject activist CustodianDisplayFragment
2021-03-05 09:22:36 +01:00
ameba23
2af236b733
add more strings from the mock-ups
2021-03-05 09:03:56 +01:00
ameba23
d46a513208
add remaining strings from the mock-ups
2021-03-05 08:46:38 +01:00
ameba23
022357fb4c
rm strings_mockups.xml
2021-03-04 14:26:47 +01:00
ameba23
008877a9da
bump secretsharingwrapper to 1.1.0
2021-03-04 10:37:20 +01:00
ameba23
01bc94c241
Merge branch 'social-backup-poc' into incorporate-mockup-fragments
...
* social-backup-poc:
move DarkCrystal interface to briar-api - import it
move DarkCrystal interface to briar-api
make SocialBackupConstants public
make DarkCrystal interface public
DarkCrystal implementation which calls SecretSharingWrapper
updated witness.gradle files
rm SecretShardingWrapper as dependency of briar-core
add SecretShardingWrapper as dependency of briar-android
implement DarkCrystal in briar-android
add updated witness.gradle
add secret-sharing-wrapper to build.gradle (WIP)
2021-03-04 09:32:28 +01:00
ameba23
03c1f9c99a
fix problems so that the mockup fragments build
2021-03-04 09:32:12 +01:00
ameba23
0b9e4915dc
set initial state of threshold representation
2021-03-04 08:52:52 +01:00
ameba23
55e5600214
add some of the strings from the mockups
2021-03-04 08:39:37 +01:00
ameba23
4c357fe87a
change threshold svg for placeholder string
2021-03-04 08:38:36 +01:00
ameba23
6a7ceb4a68
use a string as threshold representation rather than svg
2021-03-04 08:38:02 +01:00
ameba23
d917e9d642
move DarkCrystal interface to briar-api - import it
2021-03-02 12:50:43 +01:00
ameba23
c7f6270b2a
move DarkCrystal interface to briar-api
2021-03-02 12:48:49 +01:00
ameba23
681b151c8b
attempt to incorporate fragments (WIP)
2021-03-02 09:47:13 +01:00
ameba23
b86b0f5fbc
make SocialBackupConstants public
2021-03-02 08:52:43 +01:00
ameba23
dc138c713f
make DarkCrystal interface public
2021-03-02 08:52:16 +01:00
ameba23
7da49ae6df
DarkCrystal implementation which calls SecretSharingWrapper
2021-03-02 08:51:00 +01:00
ameba23
3c61f499d9
updated witness.gradle files
2021-03-02 08:49:57 +01:00
ameba23
fbe839d9ca
rm SecretShardingWrapper as dependency of briar-core
2021-03-02 08:49:09 +01:00
ameba23
f2638c9db2
add SecretShardingWrapper as dependency of briar-android
2021-03-02 08:48:38 +01:00
ameba23
808166931e
implement DarkCrystal in briar-android
2021-03-02 08:47:59 +01:00
ameba23
77d0c16530
add updated witness.gradle
2021-02-26 11:15:50 +01:00
ameba23
c991cfb926
add secret-sharing-wrapper to build.gradle (WIP)
2021-02-26 10:57:27 +01:00
ameba23
dcda13db64
add fragments (WIP)
2021-02-26 10:45:29 +01:00
ameba23
ff4640b789
update SocialBackupValidator
2021-02-25 11:30:46 +01:00
ameba23
a2426e3b2a
rm number of shards and threshold from shard messages from message parserimpl
2021-02-24 16:00:02 +01:00
ameba23
0bc4bf232f
Merge branch 'social-backup-poc' of https://code.briarproject.org/briar/briar into social-backup-poc
...
* 'social-backup-poc' of https://code.briarproject.org/briar/briar :
add combine shards stub
2021-02-24 15:44:39 +01:00
ameba23
2ed44aa2a8
rm number of shards and threshold from shard messages
2021-02-24 15:44:24 +01:00
ameba23
8496ab0a6a
rm number of shards and threshold from shard messages in message encoder
2021-02-24 15:43:50 +01:00
ameba23
b57d811b4a
rm number of shards and threshold from shard messages in stub
2021-02-24 15:43:27 +01:00
akwizgran
4077e28999
Merge branch 'combine-shards-stub' into 'social-backup-poc'
...
add combine shards stub
See merge request briar/briar!1379
2021-02-24 14:19:19 +00:00
ameba23
292fb6d3b1
add combine shards stub
2021-02-24 12:39:51 +01:00
akwizgran
4ead7cd4a1
WIP: Update our backup when contacts are added or removed.
2021-02-23 17:22:56 +00:00
akwizgran
513e696238
Initial implementation of social backup client.
2021-02-23 15:48:19 +00:00
akwizgran
f160efb0e7
Use BriarCoreModule for integration tests.
2021-02-23 15:03:28 +00:00
akwizgran
a6c2000d81
Merge branch '1825-pending-contact-error' into 'master'
...
Be more specific about errors when adding pending contact
Closes #1825
See merge request briar/briar!1354
2021-02-22 11:12:49 +00:00
akwizgran
a38a3139d9
Merge branch 'fix-message-in-profile-picture-confirmation' into 'master'
...
Fix message in profile picture confirmation
See merge request briar/briar!1356
2021-02-22 11:06:58 +00:00
akwizgran
4c8adaa02b
Merge branch '1399-unlock-activity-crash' into 'master'
...
Let LockManager only lock current, not future process
Closes #1399
See merge request briar/briar!1374
2021-02-22 10:49:17 +00:00
akwizgran
8a534b4503
Bump version numbers for 1.2.16 release.
2021-02-19 18:01:56 +00:00
akwizgran
e5b2275c82
Merge branch '1947-forum-crash' into 'master'
...
Don't add new thread items when the existing ones haven't loaded
Closes #1947
See merge request briar/briar!1375
2021-02-19 17:27:38 +00:00
Torsten Grote
5159593825
Don't add new item when the existing ones haven't loaded
2021-02-19 14:17:21 -03:00
Torsten Grote
a546fecc01
Let LockManager only lock current, not future process
...
This fixes a bug on Android 8
where the AlarmManager would re-start a killed BriarService.
Then the LockManager lingers around locked and causes an ANR on Android 8.x when the user comes back to it.
2021-02-19 10:42:43 -03:00
Nico Alt
3e7e37f5f6
Include pending contact id in error response
2021-02-19 12:00:00 +00:00
Nico Alt
d095ba0b15
Include name/alias of already existing (pending) contact in error
2021-02-19 14:44:56 +01:00
Nico Alt
7fab97d26c
Be more specific about errors when adding pending contact
...
Following the docs at
https://code.briarproject.org/briar/briar/-/blob/beta-1.2.14/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java#L110
Fixes #1825
2021-02-19 14:44:56 +01:00
