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
5,991 Commits 133 Branches 200 Tags
c19c40bdc889d2c23136a2a8b7b0a2b7fe2a27ed
Commit Graph

2747 Commits

Author SHA1 Message Date
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
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
peg
fa39e7c824 Merge branch 'social-backup-poc-separate-namespace' into 'social-backup-poc' 
Use different applicationId/app package

See merge request briar/briar!1410
 2021-03-15 09:51:32 +00:00
ameba23
37fb3bd79f return false on error when checking if local backup already exists 2021-03-15 09:57:36 +01:00
ameba23
1c5e89b100 handle error when checking for existing backup 2021-03-15 09:40:51 +01:00
Sebastian Kürten
6dc6a34d29 Use different applicationId/app package 2021-03-12 12:03:45 +01:00
ameba23
e09fedd79f add AndroidSocialBackupModule to AppModule 2021-03-12 10:51:00 +01:00
ameba23
6c3df2a3d4 add AndroidSocialBackupModule 2021-03-11 11:10:38 +01:00
Sebastian Kürten
a9edf43df2 Add ShardMessageHeader 2021-03-11 09:52:39 +01:00
ameba23
d91d2e0070 listener for setup new account button 2021-03-10 10:17:55 +01:00
ameba23
58f803a48a add new or recover screen - displays fragment with buttons 2021-03-10 09:08:34 +01:00
ameba23
ac9c71f7eb add new or recover screen WIP 2021-03-09 16:09:26 +01:00
ameba23
b3292f86ab improve ExistingBackupFragment 2021-03-09 12:36:02 +01:00
ameba23
28d2697e38 add custodian names to Existing backup fragment 2021-03-09 11:47:11 +01:00
ameba23
8e4b309a12 Existing backup fragment 2021-03-09 11:33:33 +01:00
ameba23
8a1333e8f2 display a different fragment when a backup already exists 2021-03-09 09:47:48 +01:00
ameba23
bd2a671f9f rm unused drawables 2021-03-09 08:49:40 +01:00
ameba23
25bbb5aa36 dependency injection for SocialBackupManager and DatabaseComponent 2021-03-08 18:00:24 +01:00
ameba23
57605d55ce WIP db transaction for DistributedBackupActivity 2021-03-08 17:08:19 +01:00
ameba23
6c079e172a provide default constructor for DistributedBackupActivity 2021-03-08 16:40:24 +01:00
ameba23
a101229f73 add help recover account to conversation action menu 2021-03-08 16:27:30 +01:00
ameba23
3f7f53774b inject SocialBackupManager 2021-03-08 16:26:16 +01:00
ameba23
9beb4d7b81 improve thresholdSelectorFragment 2021-03-08 13:45:02 +01:00
ameba23
378112c00c add comments 2021-03-08 13:13:00 +01:00
ameba23
451a3238be rm comments 2021-03-08 12:57:25 +01:00
ameba23
bf6dd0d924 pass treshold to DistributedBackupActivity 2021-03-08 12:43:04 +01:00
ameba23
085e25cc14 improve thresholdSelectorFragment 2021-03-08 12:31:32 +01:00
ameba23
033c9f4d59 get argument with number of custodians to thresholdselectorfragment 2021-03-08 11:58:05 +01:00
ameba23
5f7bc4a143 dont throw on no group id 2021-03-05 17:17:50 +01:00
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
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