Commit Graph

2502 Commits

Author SHA1 Message Date
ameba23
3ff6042d10 Recovery UI 2021-04-16 21:14:34 +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
4ba3fdb1e3 Always cancel the task before starting it 2021-04-15 11:47:48 +02:00
Sebastian Kürten
b901974488 Start work on an integration test 2021-04-15 10:56:08 +02:00
ameba23
e6d80ec484 Improve UI for Secret owner shard return 2021-04-14 17:22:59 +02:00
ameba23
b07206c898 Improve UI for shard return 2021-04-13 18:21:55 +02:00
ameba23
6a143eea8a Update state in UI for Custodian 2021-04-13 17:37:29 +02:00
ameba23
cd1ac43b7d get the actual ip address on local wifi and add it to qr code 2021-04-13 11:56:52 +02:00
ameba23
df37a39cb4 Qr code payload contains socket address and public key 2021-04-13 11:13:28 +02:00
ameba23
f7e40657ee Temporary - allow us to jump to the custodian return shard activity directly from the settings menu, even if we dont hold any shards 2021-04-13 09:20:37 +02:00
ameba23
d6608fd8cb add a CustodianReturnShardModule which provides the view model 2021-04-13 09:19:42 +02:00
ameba23
01bcc6d491 ensure that qr code is ready when start button is pressed 2021-04-13 08:52:42 +02:00
ameba23
5fd0d0d2d3 OwnerReturnShard activity and view model now running 2021-04-12 16:17:22 +02:00
ameba23
e006e22616 rename ReturnShardModule, it is now only used by secret owner 2021-04-12 16:15:52 +02:00
ameba23
c0827eda77 use the new OwnerReturnShardActivity 2021-04-12 15:57:15 +02:00
ameba23
d925f3be0b Secret owner return shard - activity, view model and fragment - qr code generation 2021-04-12 15:03:15 +02:00
ameba23
9d01de9868 Secret owner return shard - activity, view model and fragment 2021-04-12 12:21:16 +02:00
ameba23
9e4ace4ce7 Activity and view model for custodian returning shard 2021-04-12 10:50:47 +02:00
ameba23
ea4bd5f438 WIP activity for custodian to return a shard 2021-04-09 15:58:50 +02:00
ameba23
61453b96ab Make a ReturnShardFragment, based on ContactExchangeFragment 2021-04-08 16:43:39 +02:00
ameba23
93ee8df43a Resolve merge conflict with 1872-key-agreement 2021-04-08 12:23:18 +02:00
Torsten Grote
0ee4ade404 One more round of addressing AddNearbyContact review feedback 2021-04-07 16:18:18 -03:00
ameba23
d0b939dafb add provider for ClientHelper 2021-04-07 15:51:04 +02:00
ameba23
6bff0647d6 return shard activity dependencies 2021-04-06 16:26:57 +02:00
Torsten Grote
5b52417d20 Check if Bluetooth is supported before requesting discoverability 2021-04-01 15:36:55 -03:00
ameba23
c155020064 CustodianHelpRecoverActivity passes a ReturnShardPayload 2021-03-31 16:00:04 +02:00
Torsten Grote
4f3e4b019a Request user to turn on location for adding contact nearby on API 28+ 2021-03-29 11:30:17 -03:00
ameba23
943e734ae9 fix bugs relating to return shard activity 2021-03-26 11:00:44 +01:00
ameba23
c2cbba451d return shard activity and view model 2021-03-25 20:43:34 +01:00
ameba23
fc909a317e make add nearby contact stuff public 2021-03-25 20:42:43 +01:00
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
ameba23
2486a60fea only display custodian help recover explainer screen if you are a custodian 2021-03-22 17:03:22 +01:00
akwizgran
45d2e2ce06 Inject social backup eager singletons when Briar core is created. 2021-03-22 15:19:41 +00:00
Sebastian Kürten
c3d137a73c Move ShardsSentDismissedListener into ShardsSentFragment 2021-03-18 10:21:00 +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