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,925 Commits 133 Branches 200 Tags
dcda13db64c15340c4fdd669db71c7801c0da806
Commit Graph

5925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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. beta-1.2.16 release-1.2.16 alpha-1.2.16 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
akwizgran
6fbc82ee27 Merge branch '1075-1146-1317-ongoing-notification' into 'master' 
Use IMPORTANCE_LOW for ongoing notification, don't show a badge

Closes #1317, #1146, and #1075

See merge request briar/briar!1369
 2021-02-18 17:00:47 +00:00
akwizgran
885b03cfd7 Bump version numbers for 1.2.15 release. alpha-1.2.15 2021-02-18 15:27:57 +00:00
akwizgran
f81bfcafeb Update translations. 2021-02-18 15:26:10 +00:00
akwizgran
f36f1cf3d4 Merge branch '1764-fix-change-app-language-does-not-work' into 'master' 
Resolve "Change app language does not work"

Closes #1764

See merge request briar/briar!1367
 2021-02-17 16:59:59 +00:00
Torsten Grote
7d6a63d866 Merge branch '1934-upgrade-obfs4proxy' into 'master' 
Upgrade obfs4proxy to 0.0.12-dev

Closes #1934

See merge request briar/briar!1372
 2021-02-17 16:58:22 +00:00
akwizgran
15ebdf8dd5 Upgrade obfs4proxy to 0.0.12-dev. 2021-02-17 16:41:49 +00:00
akwizgran
db2c235283 Merge branch 'private-group-disabled' into 'master' 
Fix disabled groups after screen rotation

See merge request briar/briar!1371
 2021-02-17 14:09:57 +00:00
Sebastian Kürten
e5bd43469e Add Javados to Localizer#setLocale() 2021-02-15 14:54:20 +01:00
Torsten Grote
9366c184d8 Fix disabled groups after screen rotation 
isDissolved was reverted to LiveData that only shows a dialog when the activity was first opened
 2021-02-15 09:55:59 -03:00
Sebastian Kürten
73d2c964d4 Make language switching for robust 2021-02-15 12:31:51 +01:00
akwizgran
fb2b4209cf Use IMPORTANCE_LOW for ongoing notification, don't show a badge. 2021-02-10 11:46:41 +00:00
Torsten Grote
a04b512497 Merge branch 'tor-0.3.5.13' into 'master' 
Upgrade Tor to 0.3.5.13

Closes #1922

See merge request briar/briar!1363
 2021-02-09 12:15:45 +00:00
akwizgran
3d9515e308 Also upgrade obfs4proxy and bramble-java's Tor. 2021-02-09 12:05:54 +00:00
akwizgran
1b19b331b1 Merge branch '1904-fragment-started-too-late' into 'master' 
Don't launch fragments with back button when not started

Closes #1904

See merge request briar/briar!1365
 2021-02-09 11:05:08 +00:00
akwizgran
d151a2d7f7 Merge branch '1910-state-exception-when-adding-contact' into 'master' 
Restore remote handshake link when AddContactViewModel gets destroyed

Closes #1910

See merge request briar/briar!1364
 2021-02-09 10:49:38 +00:00
Torsten Grote
9712a4b849 Don't launch fragments with back button when not started 
Sounds strange, but apparently can happen.
 2021-02-08 16:38:15 -03:00
Torsten Grote
cf1ac5e3e5 Restore remote handshake link when AddContactViewModel gets destroyed 2021-02-08 16:03:10 -03:00
Torsten Grote
cb859e998d Upgrade Tor to 0.3.5.13 2021-02-08 15:44:35 -03:00
akwizgran
0b9345f867 Merge branch '1621-link-disappearing' into 'master' 
Remove monospace typeface from our briar:// link

Closes #1621

See merge request briar/briar!1362
 2021-02-08 18:36:16 +00:00
Torsten Grote
12988120d1 Remove monospace typeface from our briar:// link 
as this makes the text to become invisible when selecting all text on API 15-17
 2021-02-08 14:45:57 -03:00
akwizgran
8d6c866e62 Merge branch '1926-cap-scrypt-cost' into 'master' 
Cap the scrypt cost parameter to avoid OOM

Closes #1926

See merge request briar/briar!1360
 2021-02-08 17:30:57 +00:00
akwizgran
8f82cf3c73 Merge branch '1917-logcat-process' into 'master' 
Fix crash reporter to capture logs from main process

Closes #1917

See merge request briar/briar!1359
 2021-02-08 16:58:12 +00:00
Torsten Grote
21112ce092 Encrypt logs before handing them to crash report process 2021-02-08 13:43:37 -03:00
akwizgran
21ee3ea00d Merge branch 'add-custom-dictionary' into 'master' 
Add a custom dictionary

See merge request briar/briar!1361
 2021-02-08 14:01:43 +00:00
Sebastian Kürten
bb964101b3 Add a custom dictionary 
This reduces the amount of words highlighted by the spell checker and
helps focussing on words that are really misspelled.
 2021-02-08 14:35:14 +01:00
akwizgran
d796eff0f6 Cap the scrypt cost parameter to avoid OOM. 2021-02-08 11:32:03 +00:00
Torsten Grote
700ea2b387 Add support for logs to StreamReader and StreamWriter 
Shamelessly stolen from d9b4c013
 2021-02-05 17:07:48 -03:00
Sebastian Kürten
e4a66615a7 Fix remark in dialog for confirming profile picture 2021-02-04 18:43:32 +01:00