Merge pull request #1960 from vector-im/riot_1462

Chat screen: Add "view decrypted source" option on the selected event
This commit is contained in:
manuroe
2018-08-08 16:05:08 +00:00
committed by GitHub
3 changed files with 23 additions and 1 deletions
+2 -1
View File
@@ -1,4 +1,4 @@
Changes in 0.6.21 ()
Changes in 0.7.0 ()
===============================================
Improvements:
@@ -7,6 +7,7 @@ Improvements:
* Replies: Implement sending (#1911).
* Support room versioning (#1938).
* Add support of lazy-loading of room members (#1931).
* Chat screen: Add "view decrypted source" option on the selected event (#1642).
Changes in 0.6.20 (2018-07-13)
===============================================
+1
View File
@@ -257,6 +257,7 @@
"room_event_action_share" = "Share";
"room_event_action_permalink" = "Permalink";
"room_event_action_view_source" = "View Source";
"room_event_action_view_decrypted_source" = "View Decrypted Source";
"room_event_action_report" = "Report content";
"room_event_action_report_prompt_reason" = "Reason for reporting this content";
"room_event_action_kick_prompt_reason" = "Reason for kicking this user";
+20
View File
@@ -2508,6 +2508,26 @@
}]];
}
// Add "View Decrypted Source" for e2ee event we can decrypt
if (level == 1 && selectedEvent.isEncrypted && selectedEvent.clearEvent)
{
[currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_view_decrypted_source", @"Vector", nil)
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
if (weakSelf)
{
typeof(self) self = weakSelf;
[self cancelEventSelection];
// Display clear event details
[self showEventDetails:selectedEvent.clearEvent];
}
}]];
}
if (level == 1)
{