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

6065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ameba23
a0df8ded69 recover package and return shard activity 2021-03-25 20:41:34 +01:00
ameba23
9d23c876ae merge with 1872-key-agreement 2021-03-25 14:55:15 +01:00
Torsten Grote
1d44305e34 Catch exception when calling Camera#getParameters() 
Fixes #1982
 2021-03-24 15:23:16 -03:00
Torsten Grote
a37af592cd Use new ActivityResultLauncher to request permissions for AddNearbyContact 2021-03-24 15:03:53 -03:00
Torsten Grote
7f486eef4c Refactor more code into AddNearbyContactViewModel 
thus concentrating the logic there needing less back and forth with the activity
 2021-03-23 18:09:57 -03:00
ameba23
265d1da566 improve threshold choosing UI 2021-03-23 09:14:18 +01:00
ameba23
b6d57a492b only allow choosing a threshold with > 3 custodians 2021-03-23 08:25:09 +01:00
ameba23
943f107232 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:
  Inject social backup eager singletons when Briar core is created.
 2021-03-22 17:42:22 +01:00
peg
09e024ea5e Merge branch 'social-backup-eager-singletons' into 'social-backup-poc' 
Dark Crystal: Inject social backup eager singletons when Briar core is created

See merge request briar/briar!1414
 2021-03-22 16:37:20 +00:00
ameba23
2486a60fea only display custodian help recover explainer screen if you are a custodian 2021-03-22 17:03:22 +01:00
ameba23
365fa58928 add amCustodian method which determines whether you are a custodian for a given contact 2021-03-22 17:02:39 +01:00
akwizgran
45d2e2ce06 Inject social backup eager singletons when Briar core is created. 2021-03-22 15:19:41 +00:00
ameba23
b1f5d71a4e add read flag to shard message header 2021-03-22 16:13:08 +01:00
ameba23
d47c18b392 ShardReceivedEvent in briar api 2021-03-22 09:22:32 +01:00
ameba23
8ed58eaada broadcast a ShardReceivedEvent on getting a shard 2021-03-22 09:22:04 +01:00
ameba23
8478097a3c test setting read flag for shard messages 2021-03-22 08:42:25 +01:00
ameba23
0440c5c7c8 update the message tracker on incoming/outgoing shard messages 2021-03-18 14:55:30 +01:00
ameba23
58db654a9b pass MessageStatus information to shard message headers (sent and seen) 2021-03-18 12:00:19 +01:00
Sebastian Kürten
c3d137a73c Move ShardsSentDismissedListener into ShardsSentFragment 2021-03-18 10:21:00 +01:00
Sebastian Kürten
db7825d7f6 Try making message tracker assertions 2021-03-18 10:13:22 +01:00
Sebastian Kürten
24059adbd6 Start working on integration test 2021-03-18 09:51:29 +01:00
Torsten Grote
bcc0442add Merge activities for adding contact nearby 
and rename related classes to consolidate names
 2021-03-17 14:05:15 -03:00
Torsten Grote
700f6e05bf Factor out permission related code from KeyAgreementActivity to AddNearbyContactPermissionManager 2021-03-17 14:02:54 -03:00
Torsten Grote
d8327d6de2 Re-set orientation lock when fragment is left 2021-03-17 14:02:54 -03:00
Torsten Grote
5a55b3d7e3 Move Plugin related code from activity to ViewModel 2021-03-17 14:02:54 -03:00
Torsten Grote
bed87ed439 Move backend comms and logic out of KeyAgreementFragment 
into ViewModel
 2021-03-17 14:02:53 -03:00
Torsten Grote
6d1f1c7852 Get rid of KeyAgreementEventListener 
and communicate via ViewModel
 2021-03-17 14:02:53 -03:00
Torsten Grote
f6b3bde724 Introduce ContactExchangeResult 
to include all result information in LiveData
 2021-03-17 14:02:53 -03:00
Torsten Grote
94ec22bef8 Move keyagreement package into contact.add.nearby 
and fix some small warnings in the process
 2021-03-17 14:02:50 -03:00
ameba23
7d128988a7 listener for custodian scan qr code button 2021-03-17 14:51:11 +01:00
ameba23
9499a078a6 front end fragments for recovery 2021-03-17 14:41:29 +01:00
ameba23
6483b0ed87 display explainer screen when choosing recover account 2021-03-17 10:46:34 +01:00
ameba23
af097dc859 add timestamp to shard message metadata 2021-03-17 09:23:31 +01:00
ameba23
3adc6d002c add isLocal boolean to shard message headers 2021-03-17 09:17:36 +01:00
ameba23
0658e90c65 implement slightly more of conversation client to get delete messages test passing 2021-03-17 08:41:39 +01:00
Torsten Grote
ae923e5777 Merge branch '1871-viewmodel-for-introduction' into 'master' 
Introduce ViewModel for IntroductionActivity (and ContactChooserFragment)

See merge request briar/briar!1349
 2021-03-16 18:46:45 +00:00
Sebastian Kürten
46b4204805 Introduce view model for IntroductionActivity 2021-03-16 19:34:09 +01:00
ameba23
6d0aebd7ec SocialBackupManager implements a ConverationClient for shard message headers 2021-03-16 17:28:00 +01:00
ameba23
0faccfe5a3 SocialBackupManager interface has a getMessageHeaders method 2021-03-16 17:27:00 +01:00
ameba23
c19c40bdc8 when providing SocialBackupManager, register the conversation client 2021-03-16 17:23:47 +01:00
ameba23
363da96709 recover activity 2021-03-16 11:51:03 +01:00
ameba23
e9c2cb2cc5 fix merge conflict 2021-03-16 10:52:11 +01:00
ameba23
505124a22f add the contact group and local group if it doesnt already exist 2021-03-16 09:40:18 +01:00
Sebastian Kürten
9b750291d1 Remove proguard rule that we do not need after all 2021-03-15 18:29:59 +01:00
Sebastian Kürten
9c829ec7c9 Don't let proguard strip important JNA class members 2021-03-15 18:27:05 +01:00
akwizgran
2257c005b3 Merge branch 'faster-animations' into 'master' 
Use a central attribute for animation speed

See merge request briar/briar!1368
 2021-03-15 15:57:26 +00:00
Torsten Grote
eb9ff9c954 Use a central attribute for animation speed 2021-03-15 12:02:43 -03:00
ameba23
1b9ba41110 return false on error when checking if local backup already exists 2021-03-15 15:06:06 +01:00
Torsten Grote
4f08f81779 Merge branch 'raise-max-mime-type-length' into 'master' 
Test that a max-length attachment fits into a record.

See merge request briar/briar!1411
 2021-03-15 13:37:12 +00:00
akwizgran
2b0815aaac Merge branch '1951-exclude-files-from-backup' into 'master' 
Exclude all our files from backup

Closes #1951

See merge request briar/briar!1408
 2021-03-15 13:25:52 +00:00