Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity
6,174 Commits 133 Branches 200 Tags
e5eb82a5a8fcb29f95033abd50f6f78726a4704d
Commit Graph

6174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ameba23
e5eb82a5a8 Rm unused classes 2021-05-04 15:09:22 +02:00
ameba23
26a35b3212 Dont use onBackPressed when retrying after error 2021-04-27 13:07:45 +02:00
ameba23
68f135adad Additional logging in In/out DuplexSyncConnection 2021-04-27 13:06:55 +02:00
peg
7ecd952f49 Merge branch 'social-backup-restore-activity' into 'social-backup-poc' 
Social backup restore activity

See merge request briar/briar!1444
 2021-04-27 08:10:18 +00:00
ameba23
4b30b50329 Fix ReturnShardIntegrationTest 2021-04-27 10:05:43 +02:00
ameba23
c2b7657041 Improve UI for showing qr code 2021-04-26 13:03:42 +02:00
ameba23
61a052fc65 QR code display fragment 2021-04-26 12:43:37 +02:00
ameba23
d78a6604fd UI for error and explainer fragments 2021-04-26 12:29:45 +02:00
ameba23
8ffe9a6367 Modify drawables to show one device with a qr code and one without 2021-04-26 12:27:38 +02:00
ameba23
4b9c796c1a Implement handshake on IncomingDuplexSyncConnection 2021-04-26 09:59:19 +02:00
ameba23
6af739e584 Resolve conflict after merging with social-backup-outgoing-handshake 2021-04-25 12:06:49 +02:00
ameba23
50cb3997d9 Merge remote-tracking branch 'origin/social-backup-outgoing-handshake' into social-backup-restore-activity 
* origin/social-backup-outgoing-handshake:
  WIP: Add handshake support for outgoing connections.
 2021-04-25 12:01:18 +02:00
ameba23
a6f06e328b Dont use an observer when adding contacts 2021-04-25 12:00:44 +02:00
ameba23
a5f0516135 Tidy RestoreAccount 2021-04-23 13:22:10 +02:00
ameba23
3d34a36908 Show success fragment on recovering account 2021-04-23 13:18:47 +02:00
akwizgran
e29a5f487e WIP: Add handshake support for outgoing connections. 2021-04-23 12:17:56 +01:00
ameba23
acb9b18507 addContact method which also takes a handshakePublicKey 2021-04-23 12:23:13 +02:00
ameba23
f5455d320b bramble-core 2021-04-23 12:22:18 +02:00
ameba23
07141b688a Add a method to add recovered contacts to db 2021-04-22 17:42:33 +02:00
ameba23
b1c6c602a6 Add DozeView 2021-04-22 17:41:58 +02:00
ameba23
60c6c6a7ae RestoreAccount should be injected as singleton 2021-04-22 11:55:20 +02:00
ameba23
3ac7d71f8a Change to fail state if no backup found 2021-04-22 11:04:24 +02:00
ameba23
41c13f80f4 Copy code from SetPassword fragment to avoid it using the wrong view model 2021-04-22 10:56:20 +02:00
ameba23
2e03967519 Fix dependency problems after refactor 2021-04-22 09:01:44 +02:00
ameba23
4b77a9ab60 Use backup with highest version number 2021-04-21 21:53:06 +02:00
ameba23
327cbe23ee Use DozeHelper 2021-04-21 21:52:48 +02:00
ameba23
34f15b6bdc ContactData and SocialBackup now live in briar-api 2021-04-21 16:35:27 +02:00
ameba23
5c22d233ef Restore account activity/view model 2021-04-21 16:34:56 +02:00
ameba23
afc0bc3f3c Refactor and create a RestoreAccount class which does the combining 2021-04-21 16:34:28 +02:00
ameba23
2a365d986f Restore account method for account manager 2021-04-21 15:36:44 +02:00
ameba23
741c9b63d9 Custodian closes tcp socket following error 2021-04-21 15:19:36 +02:00
ameba23
5420204703 Rm fixed port constant 2021-04-21 09:56:36 +02:00
ameba23
e827b8a190 Tidy 2021-04-21 09:55:09 +02:00
ameba23
c6046a1c38 Fix bug with re-starting listening on a tcp socket 2021-04-21 09:54:42 +02:00
peg
b401232736 Merge branch 'social-backup-shard-return' into 'social-backup-poc' 
Social backup shard return

See merge request briar/briar!1433
 2021-04-20 10:52:25 +00:00
ameba23
46fc510ce2 Improve UI for account recovery 2021-04-20 12:47:14 +02:00
ameba23
b835064b5e Logging and improvements to BackupPayloadDecoderImpl 2021-04-20 12:46:22 +02:00
ameba23
ae35354e82 Encode nonce in backup payload 2021-04-19 11:37:46 +02:00
ameba23
bdbc377c8f Fix UI around receiving multiple returned shards 2021-04-19 10:07:06 +02:00
ameba23
ad3c9e101c Implement BackupPayloadDecoder 2021-04-19 09:00:05 +02:00
ameba23
101b93b3da Interface for BackupPayloadDecoder 2021-04-19 08:59:37 +02:00
ameba23
e392a0dd8b Custodian should instantiate socket at the point of connecting, secret owner parse payload 2021-04-16 21:17:10 +02:00
ameba23
00de32aa87 add encoder to ReturnShardPayload 2021-04-16 21:15:29 +02:00
ameba23
3ff6042d10 Recovery UI 2021-04-16 21:14:34 +02:00
ameba23
b3adfe19a4 Allow ReturnShardPayload instances to be compared for equality 2021-04-16 12:01:39 +02:00
ameba23
708262c512 Refactor and add real shard payload to return shard activity and view model 2021-04-16 12:00:40 +02:00
ameba23
f4d667f50a give and retrieve shard payload 2021-04-15 21:25:13 +02:00
ameba23
79369f4e7a Failure reasons 2021-04-15 21:24:22 +02:00
ameba23
fec74ed343 tasks take and produce shard payload, improve integration test 2021-04-15 21:24:01 +02:00
ameba23
4ba3fdb1e3 Always cancel the task before starting it 2021-04-15 11:47:48 +02:00