Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verified 1:1 chats in Core #4315

Merged
merged 52 commits into from
Jul 9, 2023
Merged

Verified 1:1 chats in Core #4315

merged 52 commits into from
Jul 9, 2023

Conversation

Hocuri
Copy link
Collaborator

@Hocuri Hocuri commented Apr 11, 2023

Implement #4188

BREAKING CHANGE: Remove unused DC_STR_PROTECTION_(EN)ABLED* strings
BREAKING CHANGE: Remove unused dc_set_chat_protection()

TODO before merging: Discuss about whether the outstanding Concerns and Unresolved Questions at #4188 should block merging.

TODO after merging:

  • Don't show "Changed setup for hoc@testrun.org" if we also show the "encryption dropped" message
  • Go through the user testings and discuss about whether we want to change something (all of the potential improvements are kinda controversial, mostly re-wordings, doesn't matter if we talk about it before or after merging)

@Hocuri Hocuri force-pushed the verified-oneonone branch 2 times, most recently from 4c1a85a to b0998af Compare April 18, 2023 14:25
@Hocuri Hocuri force-pushed the verified-oneonone branch 3 times, most recently from c76f85c to 726a0af Compare May 16, 2023 14:19
@Hocuri Hocuri changed the title [WIP] Verified 1:1 chats MVP [WIP] Verified 1:1 chats in Core Jun 22, 2023
@Hocuri Hocuri mentioned this pull request Jun 22, 2023
13 tasks
@Hocuri Hocuri requested a review from link2xt June 22, 2023 17:37
@Hocuri Hocuri changed the title [WIP] Verified 1:1 chats in Core Verified 1:1 chats in Core Jun 22, 2023
Cargo.toml Outdated Show resolved Hide resolved
src/chat.rs Show resolved Hide resolved
@hpk42
Copy link
Contributor

hpk42 commented Jun 23, 2023 via email

Copy link
Collaborator

@link2xt link2xt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial review.

Cargo.toml Outdated Show resolved Hide resolved
deltachat-ffi/deltachat.h Show resolved Hide resolved
deltachat-ffi/deltachat.h Outdated Show resolved Hide resolved
deltachat-ffi/deltachat.h Outdated Show resolved Hide resolved
deltachat-ffi/deltachat.h Outdated Show resolved Hide resolved
src/config.rs Show resolved Hide resolved
src/mimefactory.rs Outdated Show resolved Hide resolved
src/peerstate.rs Outdated Show resolved Hide resolved
src/peerstate.rs Show resolved Hide resolved
src/receive_imf.rs Outdated Show resolved Hide resolved
src/receive_imf.rs Show resolved Hide resolved
src/receive_imf.rs Outdated Show resolved Hide resolved
src/receive_imf.rs Outdated Show resolved Hide resolved
src/stock_str.rs Outdated Show resolved Hide resolved
deltachat-ffi/deltachat.h Outdated Show resolved Hide resolved
deltachat-ffi/deltachat.h Show resolved Hide resolved
src/chat.rs Outdated Show resolved Hide resolved
src/chat.rs Outdated Show resolved Hide resolved
src/chat.rs Outdated Show resolved Hide resolved
src/chat.rs Outdated Show resolved Hide resolved
src/receive_imf.rs Outdated Show resolved Hide resolved
src/test_utils.rs Outdated Show resolved Hide resolved
src/test_utils.rs Outdated Show resolved Hide resolved
src/tests/verified_chats.rs Outdated Show resolved Hide resolved
src/chat.rs Show resolved Hide resolved
@Hocuri Hocuri merged commit 9cd000c into master Jul 9, 2023
@Hocuri Hocuri deleted the verified-oneonone branch July 9, 2023 12:06
@hpk42
Copy link
Contributor

hpk42 commented Jul 10, 2023 via email

Hocuri added a commit to deltachat/deltachat-android that referenced this pull request Jul 14, 2023
Depends on deltachat/deltachat-core-rust#4315.

Follow-up for #2541.

- Show a "verified" icon on protection changed update messages
- Add C API
- Show a dialog over the input bar not only for contact requests, but also when the protection is broken (using the new method `isHalfBlocked()`)
  - The positive button reads "OK" (as opposed to contact requests where it reads "Accept")
- Add SVG icons, remove PNG one
- Translations
- When tapping on the `DC_INFO_PROTECTION_{EN|DIS}ABLED` message, show more information (for now, it leads to the online preview of my FAQ PR)
- Block loading remote images in the "Full Msg View" not only for contact requests, also when the protection is broken (using the new method `isHalfBlocked()`)
- Show a big verified/crossed-out-verified symbol over the `DC_INFO_PROTECTION_{EN|DIS}ABLED` messages
- Fix a bug that was kind of present before (for contact requests) but only became really visible now:
  - Set a draft with an image (or other attachment)
  - Your chat partner breaks verification
  - Expected: Both the input bar and the draft image are hidden by the input-bar-dialog.
  - Bug behavior (before c31de5b): The input bar is hidden, but the draft image stays visible.
Septias added a commit that referenced this pull request Oct 13, 2023
Implement #4188

BREAKING CHANGE: Remove unused DC_STR_PROTECTION_(EN)ABLED* strings
BREAKING CHANGE: Remove unused dc_set_chat_protection()
Hocuri added a commit to deltachat/deltachat-android that referenced this pull request Oct 23, 2023
Depends on deltachat/deltachat-core-rust#4315.

Follow-up for #2541.

- Show a "verified" icon on protection changed update messages
- Add C API
- Show a dialog over the input bar not only for contact requests, but also when the protection is broken (using the new method `isHalfBlocked()`)
  - The positive button reads "OK" (as opposed to contact requests where it reads "Accept")
- Add SVG icons, remove PNG one
- Translations
- When tapping on the `DC_INFO_PROTECTION_{EN|DIS}ABLED` message, show more information (for now, it leads to the online preview of my FAQ PR)
- Block loading remote images in the "Full Msg View" not only for contact requests, also when the protection is broken (using the new method `isHalfBlocked()`)
- Show a big verified/crossed-out-verified symbol over the `DC_INFO_PROTECTION_{EN|DIS}ABLED` messages
- Fix a bug that was kind of present before (for contact requests) but only became really visible now:
  - Set a draft with an image (or other attachment)
  - Your chat partner breaks verification
  - Expected: Both the input bar and the draft image are hidden by the input-bar-dialog.
  - Bug behavior (before c31de5b): The input bar is hidden, but the draft image stays visible.
@link2xt link2xt mentioned this pull request Oct 25, 2023
r10s pushed a commit to deltachat/deltachat-android that referenced this pull request Oct 26, 2023
Depends on deltachat/deltachat-core-rust#4315.

Follow-up for #2541.

- Show a "verified" icon on protection changed update messages
- Add C API
- Show a dialog over the input bar not only for contact requests, but also when the protection is broken (using the new method `isHalfBlocked()`)
  - The positive button reads "OK" (as opposed to contact requests where it reads "Accept")
- Add SVG icons, remove PNG one
- Translations
- When tapping on the `DC_INFO_PROTECTION_{EN|DIS}ABLED` message, show more information (for now, it leads to the online preview of my FAQ PR)
- Block loading remote images in the "Full Msg View" not only for contact requests, also when the protection is broken (using the new method `isHalfBlocked()`)
- Show a big verified/crossed-out-verified symbol over the `DC_INFO_PROTECTION_{EN|DIS}ABLED` messages
- Fix a bug that was kind of present before (for contact requests) but only became really visible now:
  - Set a draft with an image (or other attachment)
  - Your chat partner breaks verification
  - Expected: Both the input bar and the draft image are hidden by the input-bar-dialog.
  - Bug behavior (before c31de5b): The input bar is hidden, but the draft image stays visible.
r10s added a commit to deltachat/deltachat-android that referenced this pull request Oct 27, 2023
* Verified 1:1 chats, Android UI (#2560)

Depends on deltachat/deltachat-core-rust#4315.

Follow-up for #2541.

- Show a "verified" icon on protection changed update messages
- Add C API
- Show a dialog over the input bar not only for contact requests, but also when the protection is broken (using the new method `isHalfBlocked()`)
  - The positive button reads "OK" (as opposed to contact requests where it reads "Accept")
- Add SVG icons, remove PNG one
- Translations
- When tapping on the `DC_INFO_PROTECTION_{EN|DIS}ABLED` message, show more information (for now, it leads to the online preview of my FAQ PR)
- Block loading remote images in the "Full Msg View" not only for contact requests, also when the protection is broken (using the new method `isHalfBlocked()`)
- Show a big verified/crossed-out-verified symbol over the `DC_INFO_PROTECTION_{EN|DIS}ABLED` messages
- Fix a bug that was kind of present before (for contact requests) but only became really visible now:
  - Set a draft with an image (or other attachment)
  - Your chat partner breaks verification
  - Expected: Both the input bar and the draft image are hidden by the input-bar-dialog.
  - Bug behavior (before c31de5b): The input bar is hidden, but the draft image stays visible.

* change button order of verification-broken alert (#2621)

Having "OK" in the middle of the buttons is weird. The old order was:

```
End-to-end encryption cannot...
[More Info]  [OK] [Scan QR code]
```

1. _If_ the main purpose of the dialog would be to "Scan QR code",
   the text should point that out more, also the opening button.
   Then, the button position would be correct, however,
   it has to read "Cancel" then.

2. _However_, the main purpose of the dialog is to "Show Info",
   "Scan QR code" is only an optional offering and the button a shortcut only.
   And finishing "Show Info" is better done by a simple "OK".
   Then, the "OK" should be rightmost.

This PR implements the second option, the buttons read as follows afterwards:

```
End-to-end encryption cannot...
[More Info]  [Scan QR code] [OK]
```

* fix: load updated display name when chat protection breaks

* Implement feature flag for verified 1:1 chats

* Update res/values/strings.xml

Co-authored-by: Hocuri <hocuri@gmx.de>

* Update src/org/thoughtcrime/securesms/connect/DcHelper.java

* Make another AlertDialog

* Revert "Implement feature flag for verified 1:1 chats"

This reverts commit 2efd17e.

* Fix typo

* email server->email provider

---------

Co-authored-by: bjoern <r10s@b44t.com>
Co-authored-by: adbenitez <asieldbenitez@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants