Commits · baedb14e2bbfd64e6e7d25666e5a4b12bde8d593 · briar / briar

17 Jun, 2019 16 commits
- [android] allow attaching only of images with supported mime type · baedb14e
  Torsten Grote authored Feb 22, 2019
  
  baedb14e
- [android] Load image preview from database instead of content Uri · 27969267
  Torsten Grote authored Feb 18, 2019
  
  27969267
- [android] reject invalid mime types for image attachments · fc6275b0
  Torsten Grote authored Feb 18, 2019
  
  fc6275b0
- Reject attachments that exceed the allowed size · f76f9be4
  Torsten Grote authored Feb 18, 2019
```
Closes #1468
```
  f76f9be4
- [android] move unsent attachment cache logic into AttachmentController · 6167ba5c
  Torsten Grote authored Feb 18, 2019
  
  6167ba5c
- [android] Create attachments before showing previews · 55f4600a
  Torsten Grote authored Feb 15, 2019
  
  55f4600a
- Merge branch '1580-offline-state' into 'master' · 249e1e28
  Torsten Grote authored Jun 17, 2019
```
Add offline state for pending contacts

Closes #1580

See merge request !1138
```
  249e1e28
- Don't show a message for the offline state. · f0cea28a
  akwizgran authored Jun 17, 2019
  
  f0cea28a
- Merge branch '1565-strings-duplicate-handshake-links' into 'master' · 32e8ea98
  Torsten Grote authored Jun 17, 2019
```
Add strings for duplicate pending contacts

See merge request !1137
```
  32e8ea98
- Rename endpoints field. · 5a1caed8
  akwizgran authored Jun 17, 2019
  
  5a1caed8
- Resolve merge conflicts. · 22f5c42f
  akwizgran authored Jun 17, 2019
```
# Conflicts:
#   briar-android/src/main/res/values/strings.xml
```
  22f5c42f
- Add comments for translators. · aab46040
  akwizgran authored Jun 17, 2019
  
  aab46040
- Merge branch '1580-strings-offline-state' into 'master' · 18fd238a
  akwizgran authored Jun 17, 2019
```
Add string for pending contact offline state

See merge request !1136
```
  18fd238a
- Resolve merge conflicts. · 3a837b3c
  akwizgran authored Jun 17, 2019
```
# Conflicts:
#   briar-android/src/main/res/values/strings.xml
```
  3a837b3c
- Merge branch '1587-version-negotiation' into 'master' · ac259786
  akwizgran authored Jun 17, 2019
```
Add version negotiation to sync protocol

Closes #1587

See merge request !1134
```
  ac259786
- Don't cache default state when adding pending contact. · 4a67cf3c
  akwizgran authored Jun 17, 2019
```
This can overwrite the initial state broadcast by the
rendezvous poller.
```
  4a67cf3c
15 Jun, 2019 5 commits
- Merge branch '1230-strings-adding-contact-slow' into 'master' · a5041e65
  Torsten Grote authored Jun 15, 2019
```
Add strings for warning when adding a contact is slow

See merge request !1135
```
  a5041e65
- Add offline state for pending contacts. · b0e97d78
  akwizgran authored Jun 15, 2019
  
  b0e97d78
- Add strings for duplicate pending contacts. · 0d8af780
  akwizgran authored Jun 15, 2019
  
  0d8af780
- Add string for pending contact offline state. · 9c20e6b3
  akwizgran authored Jun 15, 2019
  
  9c20e6b3
- Add strings for warning when adding a contact is slow. · ab14976c
  akwizgran authored Jun 15, 2019
  
  ab14976c
13 Jun, 2019 8 commits
- Update test expectations. · ec3f821b
  akwizgran authored Jun 13, 2019
  
  ec3f821b
- Store sync versions received from contacts. · 1d546da7
  akwizgran authored Jun 13, 2019
  
  1d546da7
- Add DB methods for getting and setting sync versions. · f2c951b7
  akwizgran authored Jun 13, 2019
  
  f2c951b7
- Add sync versions column to contacts table. · 1e259c10
  akwizgran authored Jun 13, 2019
  
  1e259c10
- Use HyperSQL-compatible syntax in migration. · 3636aeba
  akwizgran authored Jun 13, 2019
  
  3636aeba
- Send versions record at start of each session. · 132e20a6
  akwizgran authored Jun 13, 2019
  
  132e20a6
- Add versions record to sync protocol. · c228e5c2
  akwizgran authored Jun 13, 2019
  
  c228e5c2
- Add thread safety and null safety annotations. · ae1d1fc5
  akwizgran authored Jun 13, 2019
  
  ae1d1fc5
12 Jun, 2019 5 commits
- Merge branch '1585-temporary-messages' into 'master' · 37f02a40
  Torsten Grote authored Jun 12, 2019
```
Add support for temporary messages

See merge request !1132
```
  37f02a40
- Turn commonly used variables into fields. · 3c8b8c39
  akwizgran authored Jun 12, 2019
  
  3c8b8c39
- Remove temporary messages at startup. · 8f839e2c
  akwizgran authored Jun 12, 2019
  
  8f839e2c
- Clean up ValidationManagerImplTest. · da4b63f2
  akwizgran authored Jun 12, 2019
  
  da4b63f2
- Allow messages to be marked as temporary. · cd40e771
  akwizgran authored Jun 12, 2019
  
  cd40e771
10 Jun, 2019 6 commits
- Merge branch '1576-db-before-signing-in' into 'master' · dd7accfa
  Torsten Grote authored Jun 10, 2019
```
Retry database tasks after signing in

Closes #1576

See merge request !1131
```
  dd7accfa
- Avoid unnecessary reloads. · 1cf99348
  akwizgran authored Jun 10, 2019
  
  1cf99348
- Retry database tasks after signing in. · e810785f
  akwizgran authored Jun 08, 2019
  
  e810785f
- Merge branch '1562-intent-router' into 'master' · 7ec826cc
  akwizgran authored Jun 10, 2019
```
Receive external intents through NavDrawerActivity

Closes #1562

See merge request !1128
```
  7ec826cc
- Merge branch '1232-polling-events' into 'master' · 4a4abd7e
  Torsten Grote authored Jun 10, 2019
```
Show "connecting" state for pending contacts

See merge request !1129
```
  4a4abd7e
- [android] don't check getIntent() for null as it should be non-null now · dc2e42e1
  Torsten Grote authored Jun 10, 2019
  
  dc2e42e1